diff options
author | Mark Whitley | 2001-03-15 17:39:29 +0000 |
---|---|---|
committer | Mark Whitley | 2001-03-15 17:39:29 +0000 |
commit | 3bf60aa723978234255786cbdfd72ef989bcfa5f (patch) | |
tree | b25dd6e949f29c38a331a0c90314887f6eebb5b0 | |
parent | e110ccb672fccad1105850d70081da3ab83d8308 (diff) | |
download | busybox-3bf60aa723978234255786cbdfd72ef989bcfa5f.zip busybox-3bf60aa723978234255786cbdfd72ef989bcfa5f.tar.gz |
If only BB_DPKG was enabled in Config.h, busybox would not build; it'd say:
dpkg.c:18: #error It looks like you are using libc5, which does not support
dpkg.c:19: #error tfind(). tfind() is used by busybox dpkg.
dpkg.c:20: #error Please disable BB_DPKG. Sorry.
This was fixed by changing the || to an && in the preprocessor.
(We've changed the logic in there too many times.)
Found using multibuild.pl.
-rw-r--r-- | archival/dpkg.c | 2 | ||||
-rw-r--r-- | dpkg.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c index 4720a88..d650817 100644 --- a/archival/dpkg.c +++ b/archival/dpkg.c @@ -14,7 +14,7 @@ /* Stupid libc doesn't have a reliable way for use to know * that libc5 is being used. Assume this is good enough */ -#if !defined __GLIBC__ || !defined __UCLIBC__ +#if !defined __GLIBC__ && !defined __UCLIBC__ #error It looks like you are using libc5, which does not support #error tfind(). tfind() is used by busybox dpkg. #error Please disable BB_DPKG. Sorry. @@ -14,7 +14,7 @@ /* Stupid libc doesn't have a reliable way for use to know * that libc5 is being used. Assume this is good enough */ -#if !defined __GLIBC__ || !defined __UCLIBC__ +#if !defined __GLIBC__ && !defined __UCLIBC__ #error It looks like you are using libc5, which does not support #error tfind(). tfind() is used by busybox dpkg. #error Please disable BB_DPKG. Sorry. |