From 6e2cc2c14732fc3e5f3d8b8e86c23c32899fbb76 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 28 Oct 1998 14:41:59 +0000 Subject: Update. 1998-10-27 Andreas Schwab * string/bits/string2.h: __USE_GNU already implies __USE_MISC. 1998-10-27 Andreas Schwab * sysdeps/generic/bits/types.h (__FDS_BITS): New macro to access fds_bits member. * sysdeps/unix/sysv/linux/alpha/bits/types.h (__FDS_BITS): Likewise. * sysdeps/unix/sysv/linux/bits/types.h (__FDS_BITS): Likewise. * sysdeps/unix/sysv/linux/mips/bits/types.h (__FDS_BITS): Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h (__FDS_BITS): Likewise. * sysdeps/unix/sysv/sysv4/solaris2/bits/types.h (__FDS_BITS): Likewise. * sysdeps/generic/bits/select.h (__FD_ZERO, __FD_SET, __FD_CLR, __FD_ISSET): Use it. * sysdeps/i386/bits/select.h (__FD_ZERO, __FD_SET, __FD_CLR, __FD_ISSET): Likewise. --- sysdeps/generic/bits/select.h | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'sysdeps/generic/bits/select.h') diff --git a/sysdeps/generic/bits/select.h b/sysdeps/generic/bits/select.h index f886aec210..1025532afe 100644 --- a/sysdeps/generic/bits/select.h +++ b/sysdeps/generic/bits/select.h @@ -23,26 +23,13 @@ /* We don't use `memset' because this would require a prototype and the array isn't too big. */ -#ifdef __USE_XOPEN -# define __FD_ZERO(s) \ +#define __FD_ZERO(s) \ do { \ unsigned int __i; \ __fd_set *__arr = (s); \ for (__i = 0; __i < sizeof (__fd_set) / sizeof (__fd_mask); ++__i) \ - __arr->fds_bits[__i] = '\0'; \ + __FDS_BITS (__arr)[__i] = '\0'; \ } while (0) -# define __FD_SET(d, s) ((s)->fds_bits[__FDELT(d)] |= __FDMASK(d)) -# define __FD_CLR(d, s) ((s)->fds_bits[__FDELT(d)] &= ~__FDMASK(d)) -# define __FD_ISSET(d, s) (((s)->fds_bits[__FDELT(d)] & __FDMASK(d)) != 0) -#else -# define __FD_ZERO(s) \ - do { \ - unsigned int __i; \ - __fd_set *__arr = (s); \ - for (__i = 0; __i < sizeof (__fd_set) / sizeof (__fd_mask); ++__i) \ - __arr->__fds_bits[__i] = '\0'; \ - } while (0) -# define __FD_SET(d, s) ((s)->__fds_bits[__FDELT(d)] |= __FDMASK(d)) -# define __FD_CLR(d, s) ((s)->__fds_bits[__FDELT(d)] &= ~__FDMASK(d)) -# define __FD_ISSET(d, s) (((s)->__fds_bits[__FDELT(d)] & __FDMASK(d)) != 0) -#endif +#define __FD_SET(d, s) (__FDS_BITS (s)[__FDELT(d)] |= __FDMASK(d)) +#define __FD_CLR(d, s) (__FDS_BITS (s)[__FDELT(d)] &= ~__FDMASK(d)) +#define __FD_ISSET(d, s) ((__FDS_BITS (s)[__FDELT(d)] & __FDMASK(d)) != 0) -- cgit v1.2.3