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 . --- conform/data/sys/mman.h-data | 18 +++++++++--------- conform/data/sys/select.h-data | 33 +++++++++++++++++++++++++++++++++ conform/data/sys/time.h-data | 5 ++--- 3 files changed, 44 insertions(+), 12 deletions(-) create mode 100644 conform/data/sys/select.h-data (limited to 'conform/data') diff --git a/conform/data/sys/mman.h-data b/conform/data/sys/mman.h-data index d744a9e..c737efb 100644 --- a/conform/data/sys/mman.h-data +++ b/conform/data/sys/mman.h-data @@ -22,17 +22,16 @@ constant POSIX_MADV_RANDOM constant POSIX_MADV_WILLNEED constant POSIX_MADV_DONTNEED -constant POSIX_TYPED_MEM_ALLOCATE -constant POSIX_TYPED_MEM_ALLOCATE_CONTIG -constant POSIX_TYPED_MEM_MAP_ALLOCATABLE +optional-constant POSIX_TYPED_MEM_ALLOCATE +optional-constant POSIX_TYPED_MEM_ALLOCATE_CONTIG +optional-constant POSIX_TYPED_MEM_MAP_ALLOCATABLE type size_t type off_t type mode_t -type {struct posix_typedmem_info} - -element {struct posix_typedmem_info} size_t posix_tmi_length +optional-type {struct posix_typedmem_info} +optional-element {struct posix_typedmem_info} size_t posix_tmi_length function int mlock (const void*, size_t) function int mlockall (int) @@ -42,9 +41,10 @@ function int msync (void*, size_t, int) function int munlock (const void*, size_t) function int munlockall (void) function int munmap (void*, size_t) -function int posix_mem_offset (const void*, size_t, off_t*, size_t*, int*) -function int posix_typed_mem_get_info (int, struct posix_typed_mem_info*) -function int posix_typed_mem_open (const char*, int, int) +function int posix_madvise (void*, size_t, int) +optional-function int posix_mem_offset (const void*, size_t, off_t*, size_t*, int*) +optional-function int posix_typed_mem_get_info (int, struct posix_typed_mem_info*) +optional-function int posix_typed_mem_open (const char*, int, int) function int shm_open (const char*, int, mode_t) function int shm_unlink (const char*) diff --git a/conform/data/sys/select.h-data b/conform/data/sys/select.h-data new file mode 100644 index 0000000..ade26a4 --- /dev/null +++ b/conform/data/sys/select.h-data @@ -0,0 +1,33 @@ +#if !defined ISO && !defined POSIX +type {struct timeval} +element {struct timeval} time_t tv_sec +element {struct timeval} suseconds_t tv_usec + +type time_t +type suseconds_t + +type sigset_t + +type {struct timespec} +element {struct timespec} time_t tv_sec +element {struct timespec} long tv_nsec + +type fd_set +element fd_set long fds_bits [] + +function-macro void FD_CLR (int, fd_set*) +function-macro int FD_ISSET (int, fd_set*) +function-macro void FD_SET (int, fd_set*) +function-macro void FD_ZERO (fd_set*) + +macro FD_SETSIZE + +#ifdef XOPEN2K +function int pselect (int, fd_set*, fd_set*, fd_set*, const struct timespec*, const sigset_t*) +#endif +function int select (int, fd_set*, fd_set*, fd_set*, struct timeval*) + +allow-header signal.h +allow-header sys/time.h +allow-header time.h +#endif diff --git a/conform/data/sys/time.h-data b/conform/data/sys/time.h-data index 49d5fbc..0de8c27 100644 --- a/conform/data/sys/time.h-data +++ b/conform/data/sys/time.h-data @@ -11,9 +11,8 @@ element {struct itimerval} {struct timeval} it_value type time_t type suseconds_t -type {struct fd_set} - -element {struct fd_set} long fds_bits [] +type fd_set +element fd_set long fds_bits [] constant ITIMER_REAL constant ITIMER_VIRTUAL -- cgit v1.1