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 a3003abeae6d9e4c06047e7d4c28661d28490703..bb833ea2fec6c3906904b17680a4a19d6328a23a 100644 (file)
--- 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 a3003abeae6d9e4c06047e7d4c28661d28490703..bb833ea2fec6c3906904b17680a4a19d6328a23a 100644 (file)
--- 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 a3003abeae6d9e4c06047e7d4c28661d28490703..bb833ea2fec6c3906904b17680a4a19d6328a23a 100644 (file)
--- 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