diff options
author | Ulrich Drepper <drepper@redhat.com> | 2001-01-27 05:01:26 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2001-01-27 05:01:26 +0000 |
commit | 3eee1304546b2562810efb96d48299bba41a6cbe (patch) | |
tree | c1d0270ab73073ee2a5a6489f4d6051101ccd266 /sysdeps/generic | |
parent | feb4f7592615575295e38700b4eeda88845173b1 (diff) | |
download | glibc-3eee1304546b2562810efb96d48299bba41a6cbe.tar.gz glibc-3eee1304546b2562810efb96d48299bba41a6cbe.tar.xz glibc-3eee1304546b2562810efb96d48299bba41a6cbe.zip |
Update.
* io/sys/poll.h: Define nfds_t and use it in poll prototype. * sysdeps/generic/poll.c: Use nfds_t type in function definition. * sysdeps/mach/hurd/poll.c: Likewise. * sysdeps/unix/bsd/poll.c: Likewise. * sysdeps/unix/sysv/linux/poll.c: Likewise. * sysdeps/unix/sysv/aix/poll.c: Likewise. * sysdeps/generic/bits/poll.h: Define NPOLLFILE only if __USE_MISC. * sysdeps/unix/sysv/linux/bits/poll.h: Likewise. * sysdeps/unix/sysv/linux/m68k/bits/poll.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/poll.h: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/poll.h: Likewise. * conform/data/poll.h-data: Fix typo in poll prototype.
Diffstat (limited to 'sysdeps/generic')
-rw-r--r-- | sysdeps/generic/bits/poll.h | 6 | ||||
-rw-r--r-- | sysdeps/generic/poll.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sysdeps/generic/bits/poll.h b/sysdeps/generic/bits/poll.h index 6aaf5859aa..f1514ffdb2 100644 --- a/sysdeps/generic/bits/poll.h +++ b/sysdeps/generic/bits/poll.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997,2000 Free Software Foundation, Inc. +/* Copyright (C) 1997, 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 @@ -39,5 +39,7 @@ #define POLLHUP 020 /* Hung up. */ #define POLLNVAL 040 /* Invalid polling request. */ +#ifdef __USE_MISC /* Canonical number of polling requests to read in at a time in poll. */ -#define NPOLLFILE 30 +# define NPOLLFILE 30 +#endif diff --git a/sysdeps/generic/poll.c b/sysdeps/generic/poll.c index f3d678e40d..d50a90a695 100644 --- a/sysdeps/generic/poll.c +++ b/sysdeps/generic/poll.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1994, 1995, 1996, 1997, 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 @@ -28,7 +28,7 @@ int poll (fds, nfds, timeout) struct pollfd *fds; - unsigned long int nfds; + nfds_t nfds; int timeout; { __set_errno (ENOSYS); |