From c2e131128be262e38f086465f3561c2faeaaef78 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Sun, 15 Dec 2002 23:23:24 +0000
Subject: * sysdeps/unix/sysv/linux/readv.c (do_readv): Use prototype defn.

	* sysdeps/unix/sysv/linux/wait.c: Don't include <nptl/pthreadP.h> or
	<tls.h> here, no need for it.
	* sysdeps/unix/sysv/linux/waitpid.c: Likewise.

	* sysdeps/unix/sysv/linux/i386/fcntl.c (do_fcntl): Take ARG as void *
	parameter, not varargs parameter.

	* sysdeps/generic/sysdep-cancel.h (LIBC_CANCEL_RESET): Evaluate the
	argument so it's not an unused variable.

	* resolv/resolv.h (__p_key_syms, __p_cert_syms, __p_class_syms,
	__p_type_syms, __p_rcode_syms): Remove decls, never really intended
	for users.

	* resolv/Versions (libresolv: GLIBC_2.3.2): New set, add __p_rcode.

2002-12-15  Art Haas  <ahaas@airmail.net>

	* nscd/connections.c: C99 initializer conversion.
	* nscd/grpcache.c: Same.
	* nscd/hstcache.c: Same.
	* nscd/pwdcache.c: Same.
---
 sysdeps/generic/sysdep-cancel.h      | 2 +-
 sysdeps/unix/sysv/linux/i386/fcntl.c | 2 +-
 sysdeps/unix/sysv/linux/wait.c       | 2 --
 sysdeps/unix/sysv/linux/waitpid.c    | 2 --
 4 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'sysdeps')

diff --git a/sysdeps/generic/sysdep-cancel.h b/sysdeps/generic/sysdep-cancel.h
index f065e6e..8422482 100644
--- a/sysdeps/generic/sysdep-cancel.h
+++ b/sysdeps/generic/sysdep-cancel.h
@@ -3,4 +3,4 @@
 /* No multi-thread handling enabled.  */
 #define SINGLE_THREAD_P (1)
 #define LIBC_CANCEL_ASYNC()	0 /* Just a dummy value.  */
-#define LIBC_CANCEL_RESET(val)  /* Nothing.  */
+#define LIBC_CANCEL_RESET(val)	((void)(val)) /* Nothing, but evaluate it.  */
diff --git a/sysdeps/unix/sysv/linux/i386/fcntl.c b/sysdeps/unix/sysv/linux/i386/fcntl.c
index bd174fe..c316769 100644
--- a/sysdeps/unix/sysv/linux/i386/fcntl.c
+++ b/sysdeps/unix/sysv/linux/i386/fcntl.c
@@ -36,7 +36,7 @@ int __have_no_fcntl64;
 
 
 static int
-do_fcntl (int fd, int cmd, ...)
+do_fcntl (int fd, int cmd, void *arg)
 {
 # ifdef __NR_fcntl64
   if (! __have_no_fcntl64)
diff --git a/sysdeps/unix/sysv/linux/wait.c b/sysdeps/unix/sysv/linux/wait.c
index f01d75c..3e39ad4 100644
--- a/sysdeps/unix/sysv/linux/wait.c
+++ b/sysdeps/unix/sysv/linux/wait.c
@@ -21,8 +21,6 @@
 #include <sys/resource.h>
 #include <stddef.h>
 #include <sysdep-cancel.h>
-#include <nptl/pthreadP.h>
-#include <tls.h>
 
 /* Wait for a child to die.  When one does, put its status in *STAT_LOC
    and return its process ID.  For errors, return (pid_t) -1.  */
diff --git a/sysdeps/unix/sysv/linux/waitpid.c b/sysdeps/unix/sysv/linux/waitpid.c
index 275fb82..2b4e7b3 100644
--- a/sysdeps/unix/sysv/linux/waitpid.c
+++ b/sysdeps/unix/sysv/linux/waitpid.c
@@ -20,8 +20,6 @@
 #include <sysdep-cancel.h>
 #include <stdlib.h>
 #include <sys/wait.h>
-#include <nptl/pthreadP.h>
-#include <tls.h>
 
 __pid_t
 __libc_waitpid (__pid_t pid, int *stat_loc, int options)
-- 
cgit v1.1