From: Mark Whitley <markw@lineo.com>
Date: Thu, 15 Mar 2001 19:12:06 +0000 (-0000)
Subject: Applied patch from Andreas Neuhaus to fix namespace conflict that made busybox
X-Git-Tag: 0_50~18
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0b57e28373550f7657bd4e026ae482806139885f;p=oweals%2Fbusybox.git

Applied patch from Andreas Neuhaus to fix namespace conflict that made busybox
not compile with uClibc.
---

diff --git a/lash.c b/lash.c
index a3003abea..bb833ea2f 100644
--- a/lash.c
+++ b/lash.c
@@ -65,6 +65,11 @@
 #include <unistd.h>
 #include <getopt.h>
 
+// fix compile with uClibc (which does #define index strchr) -andy
+#ifdef index
+#undef index
+#endif
+
 #undef BB_FEATURE_SH_WORDEXP
 
 #if BB_FEATURE_SH_WORDEXP
diff --git a/sh.c b/sh.c
index a3003abea..bb833ea2f 100644
--- a/sh.c
+++ b/sh.c
@@ -65,6 +65,11 @@
 #include <unistd.h>
 #include <getopt.h>
 
+// fix compile with uClibc (which does #define index strchr) -andy
+#ifdef index
+#undef index
+#endif
+
 #undef BB_FEATURE_SH_WORDEXP
 
 #if BB_FEATURE_SH_WORDEXP
diff --git a/shell/lash.c b/shell/lash.c
index a3003abea..bb833ea2f 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -65,6 +65,11 @@
 #include <unistd.h>
 #include <getopt.h>
 
+// fix compile with uClibc (which does #define index strchr) -andy
+#ifdef index
+#undef index
+#endif
+
 #undef BB_FEATURE_SH_WORDEXP
 
 #if BB_FEATURE_SH_WORDEXP