From 2ff458ebe647b5aba45d3b8f49ea76d2d993d5db Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 27 Jan 2001 19:28:32 +0000 Subject: Update. 2001-01-27 Ulrich Drepper * 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 and . * 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 . --- sysdeps/unix/sysv/sysv4/solaris2/bits/types.h | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'sysdeps/unix/sysv/sysv4/solaris2') diff --git a/sysdeps/unix/sysv/sysv4/solaris2/bits/types.h b/sysdeps/unix/sysv/sysv4/solaris2/bits/types.h index 65ad002f79..7765fa45b2 100644 --- a/sysdeps/unix/sysv/sysv4/solaris2/bits/types.h +++ b/sysdeps/unix/sysv/sysv4/solaris2/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,92,1994-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 @@ -89,26 +89,6 @@ typedef int __key_t; /* Type of an IPC key */ /* Number of descriptors that can fit in an `fd_set'. */ #define __FD_SETSIZE 1024 -/* 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) ((unsigned long int) 1 << ((d) % __NFDBITS)) - -typedef struct - { - /* XPG4.2 requires this member name. Otherwise avoid the name - 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; - -typedef unsigned long int __fd_mask; - /* Type to represent block size. */ typedef long int __blksize_t; -- cgit 1.4.1