aboutsummaryrefslogtreecommitdiff
path: root/io
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-01-27 05:01:26 +0000
committerUlrich Drepper <drepper@redhat.com>2001-01-27 05:01:26 +0000
commit3eee1304546b2562810efb96d48299bba41a6cbe (patch)
treec1d0270ab73073ee2a5a6489f4d6051101ccd266 /io
parentfeb4f7592615575295e38700b4eeda88845173b1 (diff)
downloadglibc-3eee1304546b2562810efb96d48299bba41a6cbe.tar
glibc-3eee1304546b2562810efb96d48299bba41a6cbe.tar.gz
glibc-3eee1304546b2562810efb96d48299bba41a6cbe.tar.bz2
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 'io')
-rw-r--r--io/sys/poll.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/io/sys/poll.h b/io/sys/poll.h
index f4c736e74a..60bd1dcf68 100644
--- a/io/sys/poll.h
+++ b/io/sys/poll.h
@@ -1,5 +1,5 @@
/* Compatibility definitions for System V `poll' interface.
- Copyright (C) 1994,96,97,98,99,2000 Free Software Foundation, Inc.
+ Copyright (C) 1994,96,97,98,99,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
@@ -25,7 +25,9 @@
/* Get the platform dependent bits of `poll'. */
#include <bits/poll.h>
-__BEGIN_DECLS
+
+/* Type used for the number of file descriptors. */
+typedef unsigned long int nfds_t;
/* Data structure describing a polling request. */
struct pollfd
@@ -36,13 +38,14 @@ struct pollfd
};
+__BEGIN_DECLS
+
/* Poll the file descriptors described by the NFDS structures starting at
FDS. If TIMEOUT is nonzero and not -1, allow TIMEOUT milliseconds for
an event to occur; if TIMEOUT is -1, block until an event occurs.
Returns the number of file descriptors with events, zero if timed out,
or -1 for errors. */
-extern int poll (struct pollfd *__fds, unsigned long int __nfds, int __timeout)
- __THROW;
+extern int poll (struct pollfd *__fds, nfds_t __nfds, int __timeout) __THROW;
__END_DECLS