X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Flwp%2Fiomgr.c;h=fcdba046f62c0f8aabbc9b6bc8f364ae3c0af70e;hp=7579813bf3a7c1a48aeab40183fd978f0d3d6ca5;hb=129b6954a6f491c6f3c3e417055bdc68d4726408;hpb=ac85550c9008baeba5cfdb400afb660fa85b6917 diff --git a/src/lwp/iomgr.c b/src/lwp/iomgr.c index 7579813..fcdba04 100644 --- a/src/lwp/iomgr.c +++ b/src/lwp/iomgr.c @@ -236,11 +236,12 @@ static struct IoRequest *NewRequest(void) #define FD_N_ZERO(nfds, x) memset((char*)(x), 0, (INTS_PER_FDS(nfds))*sizeof(int)) #endif -#if defined(AFS_LINUX22_ENV) && (__GLIBC_MINOR__ > 0) -/* Build for both glibc 2.0.x and 2.1.x */ -#define FDS_BITS __fds_bits +/* On Linux without __USE_XOPEN, we have __fds_bits. With __USE_XOPEN, or + * non-Linux, we have fds_bits. */ +#if defined(AFS_LINUX22_ENV) && (__GLIBC_MINOR__ > 0) && !defined(__USE_XOPEN) +# define FDS_BITS __fds_bits #else -#define FDS_BITS fds_bits +# define FDS_BITS fds_bits #endif /* FDSetCmp - returns 1 if any bits in fd_set1 are also set in fd_set2.