diff options
Diffstat (limited to 'sysdeps/unix')
| -rw-r--r-- | sysdeps/unix/bsd/poll.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/aix/poll.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/poll.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/m68k/bits/poll.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/bits/poll.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/poll.c | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/bits/poll.h | 6 |
7 files changed, 23 insertions, 15 deletions
diff --git a/sysdeps/unix/bsd/poll.c b/sysdeps/unix/bsd/poll.c index a1dc3e0268..375fddfcbd 100644 --- a/sysdeps/unix/bsd/poll.c +++ b/sysdeps/unix/bsd/poll.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1994,1996,1997,1998,1999,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 @@ -34,7 +34,7 @@ int __poll (fds, nfds, timeout) struct pollfd *fds; - unsigned long int nfds; + nfds_t nfds; int timeout; { static int max_fd_size; diff --git a/sysdeps/unix/sysv/aix/poll.c b/sysdeps/unix/sysv/aix/poll.c index ae041a852f..bd1967600a 100644 --- a/sysdeps/unix/sysv/aix/poll.c +++ b/sysdeps/unix/sysv/aix/poll.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 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 @@ -21,7 +21,7 @@ int __poll (fds, nfds, timeout) struct pollfd *fds; - unsigned long int nfds; + nfds_t nfds; int timeout; { return poll (fds, nfds, timeout); diff --git a/sysdeps/unix/sysv/linux/bits/poll.h b/sysdeps/unix/sysv/linux/bits/poll.h index 4aec021fed..bd6249b61f 100644 --- a/sysdeps/unix/sysv/linux/bits/poll.h +++ b/sysdeps/unix/sysv/linux/bits/poll.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997 Free Software Foundation, Inc. +/* Copyright (C) 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 @@ -47,5 +47,7 @@ #define POLLHUP 0x010 /* Hung up. */ #define POLLNVAL 0x020 /* 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/unix/sysv/linux/m68k/bits/poll.h b/sysdeps/unix/sysv/linux/m68k/bits/poll.h index 2d4e6f6f01..7472a8005c 100644 --- a/sysdeps/unix/sysv/linux/m68k/bits/poll.h +++ b/sysdeps/unix/sysv/linux/m68k/bits/poll.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997 Free Software Foundation, Inc. +/* Copyright (C) 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 @@ -42,5 +42,7 @@ #define POLLHUP 0x010 /* Hung up. */ #define POLLNVAL 0x020 /* 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/unix/sysv/linux/mips/bits/poll.h b/sysdeps/unix/sysv/linux/mips/bits/poll.h index 9b7826af6c..b0ef0788d7 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/poll.h +++ b/sysdeps/unix/sysv/linux/mips/bits/poll.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997 Free Software Foundation, Inc. +/* Copyright (C) 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 @@ -47,5 +47,7 @@ #define POLLHUP 0x010 /* Hung up. */ #define POLLNVAL 0x020 /* 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/unix/sysv/linux/poll.c b/sysdeps/unix/sysv/linux/poll.c index 9f831c8824..4efe238ab5 100644 --- a/sysdeps/unix/sysv/linux/poll.c +++ b/sysdeps/unix/sysv/linux/poll.c @@ -1,5 +1,5 @@ /* Poll system call, with emulation if it is not available. - Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 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 @@ -32,7 +32,7 @@ extern int __syscall_poll (struct pollfd *__unbounded fds, unsigned int nfds, int timeout); # if __ASSUME_POLL_SYSCALL == 0 -static int __emulate_poll (struct pollfd *fds, unsigned long int nfds, +static int __emulate_poll (struct pollfd *fds, nfds_t nfds, int timeout) internal_function; # endif @@ -40,7 +40,7 @@ static int __emulate_poll (struct pollfd *fds, unsigned long int nfds, int __poll (fds, nfds, timeout) struct pollfd *fds; - unsigned long int nfds; + nfds_t nfds; int timeout; { # if __ASSUME_POLL_SYSCALL == 0 diff --git a/sysdeps/unix/sysv/linux/sparc/bits/poll.h b/sysdeps/unix/sysv/linux/sparc/bits/poll.h index 2d4e6f6f01..7472a8005c 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/poll.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/poll.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997 Free Software Foundation, Inc. +/* Copyright (C) 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 @@ -42,5 +42,7 @@ #define POLLHUP 0x010 /* Hung up. */ #define POLLNVAL 0x020 /* 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 |