mirror of
https://github.com/sheumann/hush.git
synced 2024-12-23 05:29:58 +00:00
Applied patch from Andreas Neuhaus to fix namespace conflict that made busybox
not compile with uClibc.
This commit is contained in:
parent
b0c2b7dfe3
commit
0b57e28373
5
lash.c
5
lash.c
@ -65,6 +65,11 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <getopt.h>
|
#include <getopt.h>
|
||||||
|
|
||||||
|
// fix compile with uClibc (which does #define index strchr) -andy
|
||||||
|
#ifdef index
|
||||||
|
#undef index
|
||||||
|
#endif
|
||||||
|
|
||||||
#undef BB_FEATURE_SH_WORDEXP
|
#undef BB_FEATURE_SH_WORDEXP
|
||||||
|
|
||||||
#if BB_FEATURE_SH_WORDEXP
|
#if BB_FEATURE_SH_WORDEXP
|
||||||
|
5
sh.c
5
sh.c
@ -65,6 +65,11 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <getopt.h>
|
#include <getopt.h>
|
||||||
|
|
||||||
|
// fix compile with uClibc (which does #define index strchr) -andy
|
||||||
|
#ifdef index
|
||||||
|
#undef index
|
||||||
|
#endif
|
||||||
|
|
||||||
#undef BB_FEATURE_SH_WORDEXP
|
#undef BB_FEATURE_SH_WORDEXP
|
||||||
|
|
||||||
#if BB_FEATURE_SH_WORDEXP
|
#if BB_FEATURE_SH_WORDEXP
|
||||||
|
@ -65,6 +65,11 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <getopt.h>
|
#include <getopt.h>
|
||||||
|
|
||||||
|
// fix compile with uClibc (which does #define index strchr) -andy
|
||||||
|
#ifdef index
|
||||||
|
#undef index
|
||||||
|
#endif
|
||||||
|
|
||||||
#undef BB_FEATURE_SH_WORDEXP
|
#undef BB_FEATURE_SH_WORDEXP
|
||||||
|
|
||||||
#if BB_FEATURE_SH_WORDEXP
|
#if BB_FEATURE_SH_WORDEXP
|
||||||
|
Loading…
Reference in New Issue
Block a user