diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-01-27 19:28:32 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-01-27 19:28:32 +0000 |
| commit | 2ff458ebe647b5aba45d3b8f49ea76d2d993d5db (patch) | |
| tree | 384a317dd5538204979905ed9e8856513a946556 /bits | |
| parent | eec409170bdfca76393e39502c0435e25c62153a (diff) | |
Update.
2001-01-27 Ulrich Drepper <drepper@redhat.com>
* signal/signal.h: Fix handling of __need_* symbols.
* misc/sys/select.c: Define fd_set here. Remove __fd_set. Define
fd_mask only if __USE_MISC. Declare pselect for __USE_XOPEN2K.
* include/sys/select.h: Use fd_set not __fd_set.
* sysdeps/generic/bits/select.h: Likewise.
* sysdeps/i386/bits/select.h: Likewise.
* sysdeps/generic/bits/types.h: Don't define __fd_mask, __NFDBITS,
__FDELT, __FDMASK, and __fd_set here.
* sysdeps/unix/sysv/aix/bits/types.h: Likewise.
* sysdeps/unix/sysv/hpux/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/ia64/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/mips/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/types.h: Likewise.
* sysdeps/unix/sysv/sysv4/solaris2/bits/types.h: Likewise.
* time/sys/time.h: Define struct timeval before including <time.h>
and <sys/select.h>.
* conform/data/sys/time.h-data: fd_set is a typedef.
* conform/data/sys/select.h-data: New file.
* conform/data/sys/mman.h-data: Make typed mem stuff optional.
* conform/conformtest.pl (@headers): Add sys/select.h.
(type, optional-type): Unless testing a typedef instantiate object.
Implement optional-function.
* math/test-misc.c: Include <float.h>.
Diffstat (limited to 'bits')
| -rw-r--r-- | bits/select.h | 6 | ||||
| -rw-r--r-- | bits/types.h | 23 |
2 files changed, 4 insertions, 25 deletions
diff --git a/bits/select.h b/bits/select.h index 4513135af9..dfe623eca7 100644 --- a/bits/select.h +++ b/bits/select.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -26,8 +26,8 @@ #define __FD_ZERO(s) \ do { \ unsigned int __i; \ - __fd_set *__arr = (s); \ - for (__i = 0; __i < sizeof (__fd_set) / sizeof (__fd_mask); ++__i) \ + fd_set *__arr = (s); \ + for (__i = 0; __i < sizeof (fd_set) / sizeof (__fd_mask); ++__i) \ __FDS_BITS (__arr)[__i] = 0; \ } while (0) #define __FD_SET(d, s) (__FDS_BITS (s)[__FDELT(d)] |= __FDMASK(d)) diff --git a/bits/types.h b/bits/types.h index fd2ec223ea..13d7120f2f 100644 --- a/bits/types.h +++ b/bits/types.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,92,94,95,96,97,98,99,2000 Free Software Foundation, Inc. +/* Copyright (C) 1991,1992,94-1999,2000,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -93,30 +93,9 @@ typedef int __clockid_t; typedef int __timer_t; -/* One element in the file descriptor mask array. */ -typedef unsigned long int __fd_mask; - /* Number of descriptors that can fit in an `fd_set'. */ #define __FD_SETSIZE 256 -/* It's easier to assume 8-bit bytes than to get CHAR_BIT. */ -#define __NFDBITS (sizeof (unsigned long int) * 8) -#define __FDELT(d) ((d) / __NFDBITS) -#define __FDMASK(d) ((__fd_mask) 1 << ((d) % __NFDBITS)) - -/* fd_set for select and pselect. */ -typedef struct - { - /* XPG4.2 requires this member name. Otherwise avoid the name - from the user namespace. */ -#ifdef __USE_XOPEN - __fd_mask fds_bits[(__FD_SETSIZE + (__NFDBITS - 1)) / __NFDBITS]; -# define __FDS_BITS(set) ((set)->fds_bits) -#else - __fd_mask __fds_bits[(__FD_SETSIZE + (__NFDBITS - 1)) / __NFDBITS]; -# define __FDS_BITS(set) ((set)->__fds_bits) -#endif - } __fd_set; /* XXX Used in `struct shmid_ds'. */ typedef unsigned short int __ipc_pid_t; |