diff options
| author | Ron Yorston <rmy@pobox.com> | 2017-07-18 13:13:10 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2017-07-18 13:19:12 +0100 |
| commit | 258200ff81d5a9da54dab35acf36213eff1e399b (patch) | |
| tree | f31d67570421ce0bf073e1a86aabc6129df16710 /findutils | |
| parent | 18afed0f98d020608c65293ecb9246dab6c58db3 (diff) | |
| download | busybox-w32-258200ff81d5a9da54dab35acf36213eff1e399b.tar.gz busybox-w32-258200ff81d5a9da54dab35acf36213eff1e399b.tar.bz2 busybox-w32-258200ff81d5a9da54dab35acf36213eff1e399b.zip | |
grep: remove hack to disable EXTRA_COMPAT
The hack to disable EXTRA_COMPAT in grep was incomplete and left
the -z option enabled but non-functional.
Remove the hack and change the default MinGW configurations to disable
EXTRA_COMPAT.
Diffstat (limited to 'findutils')
| -rw-r--r-- | findutils/grep.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/findutils/grep.c b/findutils/grep.c index 4e5501d03..d66d85a53 100644 --- a/findutils/grep.c +++ b/findutils/grep.c | |||
| @@ -173,16 +173,6 @@ enum { | |||
| 173 | #define PRINT_FILES_WITHOUT_MATCHES (option_mask32 & OPT_L) | 173 | #define PRINT_FILES_WITHOUT_MATCHES (option_mask32 & OPT_L) |
| 174 | #define NUL_DELIMITED (option_mask32 & OPT_z) | 174 | #define NUL_DELIMITED (option_mask32 & OPT_z) |
| 175 | 175 | ||
| 176 | #if ENABLE_PLATFORM_MINGW32 | ||
| 177 | # ifndef RE_TRANSLATE_TYPE | ||
| 178 | # define RE_TRANSLATE_TYPE unsigned char* | ||
| 179 | # endif | ||
| 180 | # undef ENABLE_EXTRA_COMPAT | ||
| 181 | # define ENABLE_EXTRA_COMPAT 0 | ||
| 182 | # undef IF_EXTRA_COMPAT | ||
| 183 | # define IF_EXTRA_COMPAT(x) | ||
| 184 | #endif | ||
| 185 | |||
| 186 | struct globals { | 176 | struct globals { |
| 187 | int max_matches; | 177 | int max_matches; |
| 188 | #if !ENABLE_EXTRA_COMPAT | 178 | #if !ENABLE_EXTRA_COMPAT |