| OLD | NEW |
| 1 diff --git a/configure b/configure | 1 diff --git a/configure b/configure |
| 2 --- a/configure | 2 --- a/configure |
| 3 +++ b/configure | 3 +++ b/configure |
| 4 @@ -33696,7 +33696,6 @@ printf "%s\n" "$gl_cv_cc_uninitialized_supported" >&6; } | 4 @@ -33696,7 +33696,6 @@ printf "%s\n" "$gl_cv_cc_uninitialized_supported" >&6; } |
| 5 -Wattributes \ | 5 -Wattributes \ |
| 6 -Wbad-function-cast \ | 6 -Wbad-function-cast \ |
| 7 -Wbuiltin-macro-redefined \ | 7 -Wbuiltin-macro-redefined \ |
| 8 - -Wcast-align \ | 8 - -Wcast-align \ |
| 9 -Wchar-subscripts \ | 9 -Wchar-subscripts \ |
| 10 -Wclobbered \ | 10 -Wclobbered \ |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 +++ b/src/Makefile.in | 147 +++ b/src/Makefile.in |
| 148 @@ -1259,7 +1259,7 @@ clean-binPROGRAMS: | 148 @@ -1259,7 +1259,7 @@ clean-binPROGRAMS: |
| 149 | 149 |
| 150 grep$(EXEEXT): $(grep_OBJECTS) $(grep_DEPENDENCIES) $(EXTRA_grep_DEPENDENCIES) | 150 grep$(EXEEXT): $(grep_OBJECTS) $(grep_DEPENDENCIES) $(EXTRA_grep_DEPENDENCIES) |
| 151 @rm -f grep$(EXEEXT) | 151 @rm -f grep$(EXEEXT) |
| 152 - $(AM_V_CCLD)$(LINK) $(grep_OBJECTS) $(grep_LDADD) $(LIBS) | 152 - $(AM_V_CCLD)$(LINK) $(grep_OBJECTS) $(grep_LDADD) $(LIBS) |
| 153 + $(AM_V_CCLD)$(LINK) $(grep_OBJECTS) $(grep_LDADD) -Wl,--undefined=PSUser
MainGet -lcli_main -lnacl_spawn -lppapi_simple -lnacl_io -lppapi -pthread $(LIBS
) | 153 + $(AM_V_CCLD)$(LINK) $(grep_OBJECTS) $(grep_LDADD) -Wl,--undefined=PSUser
MainGet -lcli_main -lnacl_spawn -lppapi_simple -lnacl_io -lppapi -pthread $(LIBS
) |
| 154 install-binSCRIPTS: $(bin_SCRIPTS) | 154 install-binSCRIPTS: $(bin_SCRIPTS) |
| 155 @$(NORMAL_INSTALL) | 155 @$(NORMAL_INSTALL) |
| 156 @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ | 156 @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ |
| 157 diff --git a/src/grep.c b/src/grep.c | |
| 158 --- a/src/grep.c | |
| 159 +++ b/src/grep.c | |
| 160 @@ -2107,7 +2107,7 @@ fgrep_to_grep_pattern (size_t len, char const *keys, | |
| 161 } | |
| 162 | |
| 163 int | |
| 164 -main (int argc, char **argv) | |
| 165 +nacl_main (int argc, char **argv) | |
| 166 { | |
| 167 char *keys; | |
| 168 size_t keycc, oldcc, keyalloc; | |
| OLD | NEW |