Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/libpthread

8 files changed, 7 insertions, 3 deletions

diff --git a/pthread/cthreads-compat.c b/pthread/cthreads-compat.c
index e0536ef2..799d3a4a 100644
--- a/pthread/cthreads-compat.c
+++ b/pthread/cthreads-compat.c
@@ -19,6 +19,7 @@
 
 #include <assert.h>
 #include <pthread.h>
+#include <stddef.h>
 
 typedef void *cthread_t;
 typedef void *(*cthread_fn_t) (void *arg);
diff --git a/pthread/pt-exit.c b/pthread/pt-exit.c
index 5fe0ba86..3b3853e3 100644
--- a/pthread/pt-exit.c
+++ b/pthread/pt-exit.c
@@ -35,7 +35,6 @@ pthread_exit (void *status)
   struct __pthread *self = _pthread_self ();
   struct __pthread_cancelation_handler **handlers;
   int oldstate;
-  int need_dealloc;
 
   /* Run any cancelation handlers.  According to POSIX, the
      cancellation cleanup handlers should be called with cancellation
diff --git a/sysdeps/generic/pt-attr-getschedparam.c b/sysdeps/generic/pt-attr-getschedparam.c
index 6c3f15be..190cf9d0 100644
--- a/sysdeps/generic/pt-attr-getschedparam.c
+++ b/sysdeps/generic/pt-attr-getschedparam.c
@@ -19,6 +19,7 @@
 
 #include <pthread.h>
 #include <sched.h>
+#include <string.h>
 
 #include <pt-internal.h>
 
diff --git a/sysdeps/mach/hurd/ia32/pt-setup.c b/sysdeps/mach/hurd/ia32/pt-setup.c
index ba438d6a..7eb223c2 100644
--- a/sysdeps/mach/hurd/ia32/pt-setup.c
+++ b/sysdeps/mach/hurd/ia32/pt-setup.c
@@ -64,7 +64,7 @@ stack_setup (struct __pthread *thread,
     {
       /* And then the call frame.  */
       top -= 2;
-      top = (uintptr_t) top & ~0xf;
+      top = (uintptr_t *) ((uintptr_t) top & ~0xf);
       top[1] = (uintptr_t) arg;	/* Argument to START_ROUTINE.  */
       top[0] = (uintptr_t) start_routine;
       *--top = 0;		/* Fake return address.  */
diff --git a/tests/test-1.c b/tests/test-1.c
index 318fd6e9..6ec1afb3 100644
--- a/tests/test-1.c
+++ b/tests/test-1.c
@@ -1,6 +1,7 @@
 #define _GNU_SOURCE
 
 #include <pthread.h>
+#include <assert.h>
 #include <unistd.h>
 #include <error.h>
 #include <errno.h>
diff --git a/tests/test-16.c b/tests/test-16.c
index b6a52d01..3660f5f7 100644
--- a/tests/test-16.c
+++ b/tests/test-16.c
@@ -33,7 +33,7 @@ test (void *arg)
 }
 
 static void
-handler (int sig, siginfo_t *info, void *context)
+handler (int sig)
 {
   assert (pthread_equal (pthread_self (), testthread));
   printf ("handler: %d\n", pthread_self ());
diff --git a/tests/test-6.c b/tests/test-6.c
index 98aa8ba7..edf2919e 100644
--- a/tests/test-6.c
+++ b/tests/test-6.c
@@ -3,6 +3,7 @@
 #include <pthread.h>
 #include <stdio.h>
 #include <error.h>
+#include <assert.h>
 #include <errno.h>
 
 #define THREADS 500
diff --git a/tests/test-7.c b/tests/test-7.c
index bd97acfa..8159be34 100644
--- a/tests/test-7.c
+++ b/tests/test-7.c
@@ -1,6 +1,7 @@
 #define _GNU_SOURCE
 
 #include <pthread.h>
+#include <assert.h>
 #include <stdio.h>
 #include <error.h>
 #include <errno.h>