diff options
-rw-r--r-- | configs/mingw32_defconfig | 2 | ||||
-rw-r--r-- | configs/mingw64_defconfig | 2 | ||||
-rw-r--r-- | findutils/grep.c | 10 |
3 files changed, 2 insertions, 12 deletions
diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig index 1d71f58b6..48e90e527 100644 --- a/configs/mingw32_defconfig +++ b/configs/mingw32_defconfig | |||
@@ -11,7 +11,7 @@ CONFIG_PLATFORM_MINGW32=y | |||
11 | # Busybox Settings | 11 | # Busybox Settings |
12 | # | 12 | # |
13 | CONFIG_DESKTOP=y | 13 | CONFIG_DESKTOP=y |
14 | CONFIG_EXTRA_COMPAT=y | 14 | # CONFIG_EXTRA_COMPAT is not set |
15 | # CONFIG_INCLUDE_SUSv2 is not set | 15 | # CONFIG_INCLUDE_SUSv2 is not set |
16 | CONFIG_USE_PORTABLE_CODE=y | 16 | CONFIG_USE_PORTABLE_CODE=y |
17 | CONFIG_SHOW_USAGE=y | 17 | CONFIG_SHOW_USAGE=y |
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig index cfa76ac7e..d29345411 100644 --- a/configs/mingw64_defconfig +++ b/configs/mingw64_defconfig | |||
@@ -11,7 +11,7 @@ CONFIG_PLATFORM_MINGW32=y | |||
11 | # Busybox Settings | 11 | # Busybox Settings |
12 | # | 12 | # |
13 | CONFIG_DESKTOP=y | 13 | CONFIG_DESKTOP=y |
14 | CONFIG_EXTRA_COMPAT=y | 14 | # CONFIG_EXTRA_COMPAT is not set |
15 | # CONFIG_INCLUDE_SUSv2 is not set | 15 | # CONFIG_INCLUDE_SUSv2 is not set |
16 | CONFIG_USE_PORTABLE_CODE=y | 16 | CONFIG_USE_PORTABLE_CODE=y |
17 | CONFIG_SHOW_USAGE=y | 17 | CONFIG_SHOW_USAGE=y |
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 |