summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Whitley2001-03-15 19:12:06 +0000
committerMark Whitley2001-03-15 19:12:06 +0000
commit0b57e28373550f7657bd4e026ae482806139885f (patch)
tree52c1b16942df6eaeedfb0e52bb166a13f36e89d5
parentb0c2b7dfe3222af79f9d830934cf92ee866834f6 (diff)
downloadbusybox-0b57e28373550f7657bd4e026ae482806139885f.zip
busybox-0b57e28373550f7657bd4e026ae482806139885f.tar.gz
Applied patch from Andreas Neuhaus to fix namespace conflict that made busybox
not compile with uClibc.
-rw-r--r--lash.c5
-rw-r--r--sh.c5
-rw-r--r--shell/lash.c5
3 files changed, 15 insertions, 0 deletions
diff --git a/lash.c b/lash.c
index a3003ab..bb833ea 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 a3003ab..bb833ea 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 a3003ab..bb833ea 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