aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-03-14 01:36:52 +0000
committerEric Andersen <andersen@codepoet.org>2001-03-14 01:36:52 +0000
commit2b1c367a985849a7dde5c9f1cef1db8f6cf951bd (patch)
tree431160b939c5bbcc21d486073bbce51c7becc400
parent3c0b425cdee0883b0f5202b43e7d13845e7e1c79 (diff)
downloadbusybox-2b1c367a985849a7dde5c9f1cef1db8f6cf951bd.tar.gz
Amazing the difference between an "and" and an "or".
-rw-r--r--busybox.h3
-rw-r--r--include/busybox.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/busybox.h b/busybox.h
index 977fe33ec..194fd8220 100644
--- a/busybox.h
+++ b/busybox.h
@@ -35,9 +35,10 @@
#include "dmalloc.h"
#endif
+#include <features.h>
/* 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__
/* libc5 doesn't define socklen_t */
typedef unsigned int socklen_t;
#endif
diff --git a/include/busybox.h b/include/busybox.h
index 977fe33ec..194fd8220 100644
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -35,9 +35,10 @@
#include "dmalloc.h"
#endif
+#include <features.h>
/* 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__
/* libc5 doesn't define socklen_t */
typedef unsigned int socklen_t;
#endif