diff options
author | markw <markw@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-03-15 19:12:06 +0000 |
---|---|---|
committer | markw <markw@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-03-15 19:12:06 +0000 |
commit | 5b488c27b46612caa40d9fabccba0ae9f2af71ee (patch) | |
tree | 52c1b16942df6eaeedfb0e52bb166a13f36e89d5 /sh.c | |
parent | 6a09f5c7cf32fcf2c1b94250440e9c6260a75932 (diff) | |
download | busybox-w32-5b488c27b46612caa40d9fabccba0ae9f2af71ee.tar.gz busybox-w32-5b488c27b46612caa40d9fabccba0ae9f2af71ee.tar.bz2 busybox-w32-5b488c27b46612caa40d9fabccba0ae9f2af71ee.zip |
Applied patch from Andreas Neuhaus to fix namespace conflict that made busybox
not compile with uClibc.
git-svn-id: svn://busybox.net/trunk/busybox@2094 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'sh.c')
-rw-r--r-- | sh.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -65,6 +65,11 @@ | |||
65 | #include <unistd.h> | 65 | #include <unistd.h> |
66 | #include <getopt.h> | 66 | #include <getopt.h> |
67 | 67 | ||
68 | // fix compile with uClibc (which does #define index strchr) -andy | ||
69 | #ifdef index | ||
70 | #undef index | ||
71 | #endif | ||
72 | |||
68 | #undef BB_FEATURE_SH_WORDEXP | 73 | #undef BB_FEATURE_SH_WORDEXP |
69 | 74 | ||
70 | #if BB_FEATURE_SH_WORDEXP | 75 | #if BB_FEATURE_SH_WORDEXP |