diff options
| author | Mark Whitley <markw@lineo.com> | 2001-03-15 19:12:06 +0000 |
|---|---|---|
| committer | Mark Whitley <markw@lineo.com> | 2001-03-15 19:12:06 +0000 |
| commit | 0b57e28373550f7657bd4e026ae482806139885f (patch) | |
| tree | 52c1b16942df6eaeedfb0e52bb166a13f36e89d5 | |
| parent | b0c2b7dfe3222af79f9d830934cf92ee866834f6 (diff) | |
Applied patch from Andreas Neuhaus to fix namespace conflict that made busybox
not compile with uClibc.
| -rw-r--r-- | lash.c | 5 | ||||
| -rw-r--r-- | sh.c | 5 | ||||
| -rw-r--r-- | shell/lash.c | 5 |
3 files changed, 15 insertions, 0 deletions
@@ -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 @@ -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 |