From 2b1c367a985849a7dde5c9f1cef1db8f6cf951bd Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Wed, 14 Mar 2001 01:36:52 +0000 Subject: [PATCH] Amazing the difference between an "and" and an "or". --- busybox.h | 3 ++- include/busybox.h | 3 ++- 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 /* 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 /* 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