aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2017-06-28 12:23:56 +0200
committerJohannes Schindelin <johannes.schindelin@gmx.de>2017-07-14 22:57:49 +0200
commit8b66b26302cb1d5422605bd247f7df53e0d2bb26 (patch)
treefbd5fddc94a88f862945f0515b50d6cc2bb7cf58
parentab3bdddbe4d559e4bd445679a6a7e86b44a3ccc2 (diff)
downloadbusybox-w32-8b66b26302cb1d5422605bd247f7df53e0d2bb26.tar.gz
busybox-w32-8b66b26302cb1d5422605bd247f7df53e0d2bb26.tar.bz2
busybox-w32-8b66b26302cb1d5422605bd247f7df53e0d2bb26.zip
grep: prepare for an upgrade of the regex code
The upcoming updated regex code will already define the RE_TRANSLATE_TYPE constant, so let's safeguard lest we redefine it. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
-rw-r--r--findutils/grep.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/findutils/grep.c b/findutils/grep.c
index b115d9a1d..4e5501d03 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -174,7 +174,9 @@ enum {
174#define NUL_DELIMITED (option_mask32 & OPT_z) 174#define NUL_DELIMITED (option_mask32 & OPT_z)
175 175
176#if ENABLE_PLATFORM_MINGW32 176#if ENABLE_PLATFORM_MINGW32
177# define RE_TRANSLATE_TYPE unsigned char* 177# ifndef RE_TRANSLATE_TYPE
178# define RE_TRANSLATE_TYPE unsigned char*
179# endif
178# undef ENABLE_EXTRA_COMPAT 180# undef ENABLE_EXTRA_COMPAT
179# define ENABLE_EXTRA_COMPAT 0 181# define ENABLE_EXTRA_COMPAT 0
180# undef IF_EXTRA_COMPAT 182# undef IF_EXTRA_COMPAT