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.

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
 # Busybox Settings
 #
 CONFIG_DESKTOP=y
-CONFIG_EXTRA_COMPAT=y
+# CONFIG_EXTRA_COMPAT is not set
 # CONFIG_INCLUDE_SUSv2 is not set
 CONFIG_USE_PORTABLE_CODE=y
 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
 # Busybox Settings
 #
 CONFIG_DESKTOP=y
-CONFIG_EXTRA_COMPAT=y
+# CONFIG_EXTRA_COMPAT is not set
 # CONFIG_INCLUDE_SUSv2 is not set
 CONFIG_USE_PORTABLE_CODE=y
 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 {
 #define PRINT_FILES_WITHOUT_MATCHES (option_mask32 & OPT_L)
 #define NUL_DELIMITED               (option_mask32 & OPT_z)
 
-#if ENABLE_PLATFORM_MINGW32
-# ifndef RE_TRANSLATE_TYPE
-#  define RE_TRANSLATE_TYPE unsigned char*
-# endif
-# undef ENABLE_EXTRA_COMPAT
-# define ENABLE_EXTRA_COMPAT 0
-# undef IF_EXTRA_COMPAT
-# define IF_EXTRA_COMPAT(x)
-#endif
-
 struct globals {
         int max_matches;
 #if !ENABLE_EXTRA_COMPAT