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.

14 files changed, 56 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index f738588bf5..bef8a11e41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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_.
diff --git a/bits/poll.h b/bits/poll.h
index 6aaf5859aa..f1514ffdb2 100644
--- a/bits/poll.h
+++ b/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/conform/data/poll.h-data b/conform/data/poll.h-data
index b695cad6d8..69fd724a3e 100644
--- a/conform/data/poll.h-data
+++ b/conform/data/poll.h-data
@@ -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_*
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
 
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);
diff --git a/sysdeps/mach/hurd/poll.c b/sysdeps/mach/hurd/poll.c
index ef3318e171..29a8afaf53 100644
--- a/sysdeps/mach/hurd/poll.c
+++ b/sysdeps/mach/hurd/poll.c
@@ -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;
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