* 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.
This commit is contained in:
Ulrich Drepper 2001-01-27 05:01:26 +00:00
parent feb4f75926
commit 3eee130454
14 changed files with 56 additions and 28 deletions

View File

@ -1,5 +1,18 @@
2001-01-26 Ulrich Drepper <drepper@redhat.com>
* 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.
* sysdeps/gnu/netinet/tcp.h: Define everything but TCP_ macros
only if __USE_MISC.
* conform/data/netinet/tcp.h-data: Reserved prefix TCP_.

View File

@ -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

View File

@ -17,7 +17,7 @@ constant POLLERR
constant POLLHUP
constant POLLNVAL
function int poll (struct pollfd[], nfsd_t, int)
function int poll (struct pollfd[], nfds_t, int)
allow pd_*
allow ph_*

View File

@ -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

View File

@ -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

View File

@ -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);

View File

@ -1,5 +1,5 @@
/* poll file descriptors. Hurd version.
Copyright (C) 1998 Free Software Foundation, Inc.
Copyright (C) 1998, 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
@ -31,7 +31,7 @@
int
__poll (fds, nfds, timeout)
struct pollfd *fds;
unsigned long int nfds;
nfds_t nfds;
int timeout;
{
struct timespec ts, *to;

View File

@ -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;

View File

@ -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);

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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