aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/generic/sysdep-cancel.h2
-rw-r--r--sysdeps/unix/sysv/linux/i386/fcntl.c2
-rw-r--r--sysdeps/unix/sysv/linux/wait.c2
-rw-r--r--sysdeps/unix/sysv/linux/waitpid.c2
4 files changed, 2 insertions, 6 deletions
diff --git a/sysdeps/generic/sysdep-cancel.h b/sysdeps/generic/sysdep-cancel.h
index f065e6e437..8422482819 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 bd174fe809..c316769eba 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 f01d75cc38..3e39ad4bf1 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 275fb826b4..2b4e7b37d4 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)