diff --git a/ChangeLog b/ChangeLog index e6145a182e..2d910c538c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +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. + 1998-10-28 Geoff Keating * sysdeps/unix/sysv/linux/powerpc/syscalls.list: Tidy up, correct diff --git a/bits/select.h b/bits/select.h index f886aec210..1025532afe 100644 --- a/bits/select.h +++ b/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) diff --git a/string/bits/string2.h b/string/bits/string2.h index cfbcc18aa0..4efa5251f7 100644 --- a/string/bits/string2.h +++ b/string/bits/string2.h @@ -1013,7 +1013,7 @@ __strsep_g (char **__s, __const char *__reject) /* We need the memory allocation functions for inline strdup(). Referring to stdlib.h (even minimally) is not allowed in any of the tight standards compliant modes. */ -#if defined __USE_MISC || defined __USE_GNU +#ifdef __USE_MISC # if !defined _HAVE_STRING_ARCH_strdup || !defined _HAVE_STRING_ARCH_strndup # define __need_malloc_and_calloc 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) diff --git a/sysdeps/i386/bits/select.h b/sysdeps/i386/bits/select.h index 2e31f3bc59..d31792d852 100644 --- a/sysdeps/i386/bits/select.h +++ b/sysdeps/i386/bits/select.h @@ -23,97 +23,51 @@ #if defined __GNUC__ && __GNUC__ >= 2 -# ifdef __USE_XOPEN -# define __FD_ZERO(fdsp) \ +# define __FD_ZERO(fdsp) \ do { \ int __d0, __d1; \ __asm__ __volatile__ ("cld; rep; stosl" \ - : "=m" ((fdsp)->fds_bits[__FDELT (__FD_SETSIZE)]), \ + : "=m" (__FDS_BITS (fdsp)[__FDELT (__FD_SETSIZE)]), \ "=&c" (__d0), "=&D" (__d1) \ : "a" (0), "1" (sizeof (__fd_set) \ / sizeof (__fd_mask)), \ - "2" (&(fdsp)->fds_bits[0]) \ + "2" (&__FDS_BITS (fdsp)[0]) \ : "memory"); \ } while (0) -# define __FD_SET(fd, fdsp) \ +# define __FD_SET(fd, fdsp) \ __asm__ __volatile__ ("btsl %1,%0" \ - : "=m" ((fdsp)->fds_bits[__FDELT (fd)]) \ + : "=m" (__FDS_BITS (fdsp)[__FDELT (fd)]) \ : "r" (((int) (fd)) % __NFDBITS) \ : "cc","memory") -# define __FD_CLR(fd, fdsp) \ +# define __FD_CLR(fd, fdsp) \ __asm__ __volatile__ ("btrl %1,%0" \ - : "=m" ((fdsp)->fds_bits[__FDELT (fd)]) \ + : "=m" (__FDS_BITS (fdsp)[__FDELT (fd)]) \ : "r" (((int) (fd)) % __NFDBITS) \ : "cc","memory") -# define __FD_ISSET(fd, fdsp) \ +# define __FD_ISSET(fd, fdsp) \ (__extension__ \ ({register char __result; \ __asm__ __volatile__ ("btl %1,%2 ; setcb %b0" \ : "=q" (__result) \ : "r" (((int) (fd)) % __NFDBITS), \ - "m" ((fdsp)->fds_bits[__FDELT (fd)]) \ + "m" (__FDS_BITS (fdsp)[__FDELT (fd)]) \ : "cc"); \ __result; })) -# else -# define __FD_ZERO(fdsp) \ - do { \ - int __d0, __d1; \ - __asm__ __volatile__ ("cld; rep; stosl" \ - : "=m" ((fdsp)->__fds_bits[__FDELT (__FD_SETSIZE)]),\ - "=&c" (__d0), "=&D" (__d1) \ - : "a" (0), "1" (sizeof (__fd_set) \ - / sizeof (__fd_mask)), \ - "2" (&(fdsp)->__fds_bits[0]) \ - : "memory"); \ - } while (0) - -# define __FD_SET(fd, fdsp) \ - __asm__ __volatile__ ("btsl %1,%0" \ - : "=m" ((fdsp)->__fds_bits[__FDELT (fd)]) \ - : "r" (((int) (fd)) % __NFDBITS) \ - : "cc","memory") -# define __FD_CLR(fd, fdsp) \ - __asm__ __volatile__ ("btrl %1,%0" \ - : "=m" ((fdsp)->__fds_bits[__FDELT (fd)]) \ - : "r" (((int) (fd)) % __NFDBITS) \ - : "cc","memory") -# define __FD_ISSET(fd, fdsp) \ - (__extension__ \ - ({register char __result; \ - __asm__ __volatile__ ("btl %1,%2 ; setcb %b0" \ - : "=q" (__result) \ - : "r" (((int) (fd)) % __NFDBITS), \ - "m" ((fdsp)->__fds_bits[__FDELT (fd)]) \ - : "cc"); \ - __result; })) -# endif #else /* ! GNU CC */ /* We don't use `memset' because this would require a prototype and the array isn't too big. */ -# ifdef __USE_XOPEN -# define __FD_ZERO(set) \ +# define __FD_ZERO(set) \ do { \ unsigned int __i; \ __fd_set *__arr = (set); \ 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, set) ((set)->fds_bits[__FDELT (d)] |= __FDMASK (d)) -# define __FD_CLR(d, set) ((set)->fds_bits[__FDELT (d)] &= ~__FDMASK (d)) -# define __FD_ISSET(d, set) ((set)->fds_bits[__FDELT (d)] & __FDMASK (d)) -# else - do { \ - unsigned int __i; \ - __fd_set *__arr = (set); \ - for (__i = 0; __i < sizeof (__fd_set) / sizeof (__fd_mask); ++__i) \ - __arr->__fds_bits[__i] = 0; \ - } while (0) -# define __FD_SET(d, set) ((set)->__fds_bits[__FDELT (d)] |= __FDMASK (d)) -# define __FD_CLR(d, set) ((set)->__fds_bits[__FDELT (d)] &= ~__FDMASK (d)) -# define __FD_ISSET(d, set) ((set)->__fds_bits[__FDELT (d)] & __FDMASK (d)) -# endif +# define __FD_SET(d, set) (__FDS_BITS (set)[__FDELT (d)] |= __FDMASK (d)) +# define __FD_CLR(d, set) (__FDS_BITS (set)[__FDELT (d)] &= ~__FDMASK (d)) +# define __FD_ISSET(d, set) (__FDS_BITS (set)[__FDELT (d)] & __FDMASK (d)) #endif /* GNU CC */ diff --git a/sysdeps/unix/sysv/linux/alpha/bits/types.h b/sysdeps/unix/sysv/linux/alpha/bits/types.h index 6a1e846263..d71599cb32 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/types.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/types.h @@ -106,8 +106,10 @@ typedef struct from the user namespace. */ #ifdef __USE_XOPEN __fd_mask fds_bits[__FD_SETSIZE / __NFDBITS]; +# define __FDS_BITS(set) ((set)->fds_bits) #else __fd_mask __fds_bits[__FD_SETSIZE / __NFDBITS]; +# define __FDS_BITS(set) ((set)->__fds_bits) #endif } __fd_set; diff --git a/sysdeps/unix/sysv/linux/bits/types.h b/sysdeps/unix/sysv/linux/bits/types.h index d95746a53d..44d610efb7 100644 --- a/sysdeps/unix/sysv/linux/bits/types.h +++ b/sysdeps/unix/sysv/linux/bits/types.h @@ -103,8 +103,10 @@ typedef struct from the global namespace. */ #ifdef __USE_XOPEN __fd_mask fds_bits[__FD_SETSIZE / __NFDBITS]; +# define __FDS_BITS(set) ((set)->fds_bits) #else __fd_mask __fds_bits[__FD_SETSIZE / __NFDBITS]; +# define __FDS_BITS(set) ((set)->__fds_bits) #endif } __fd_set; diff --git a/sysdeps/unix/sysv/linux/mips/bits/types.h b/sysdeps/unix/sysv/linux/mips/bits/types.h index 6629366c30..36a1e0e0e3 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/types.h +++ b/sysdeps/unix/sysv/linux/mips/bits/types.h @@ -103,8 +103,10 @@ typedef struct from the user namespace. */ #ifdef __USE_XOPEN __fd_mask fds_bits[__FD_SETSIZE / __NFDBITS]; +# define __FDS_BITS(set) ((set)->fds_bits) #else __fd_mask __fds_bits[__FD_SETSIZE / __NFDBITS]; +# define __FDS_BITS(set) ((set)->__fds_bits) #endif } __fd_set; diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h b/sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h index a26cac8064..b6d98853ea 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h @@ -97,8 +97,10 @@ typedef struct from the user namespace. */ #ifdef __USE_XOPEN __fd_mask fds_bits[__FD_SETSIZE / __NFDBITS]; +# define __FDS_BITS(set) ((set)->fds_bits) #else __fd_mask __fds_bits[__FD_SETSIZE / __NFDBITS]; +# define __FDS_BITS(set) ((set)->__fds_bits) #endif } __fd_set; diff --git a/sysdeps/unix/sysv/sysv4/solaris2/bits/types.h b/sysdeps/unix/sysv/sysv4/solaris2/bits/types.h index aa73ebcb19..aeba05b7b3 100644 --- a/sysdeps/unix/sysv/sysv4/solaris2/bits/types.h +++ b/sysdeps/unix/sysv/sysv4/solaris2/bits/types.h @@ -94,8 +94,10 @@ typedef struct from the user namespace. */ #ifdef __USE_XOPEN unsigned long int fds_bits[(__FD_SETSIZE + (__NFDBITS - 1)) / __NFDBITS]; +# define __FDS_BITS(set) ((set)->fds_bits) #else unsigned long int __fds_bits[(__FD_SETSIZE + (__NFDBITS - 1)) / __NFDBITS]; +# define __FDS_BITS(set) ((set)->__fds_bits) #endif } __fd_set;