Merge branch 'upstream-merged'

4 files changed, 4 insertions, 1 deletions

diff --git a/libpthread/tests/test-1.c b/libpthread/tests/test-1.c
index 318fd6e9..6ec1afb3 100644
--- a/libpthread/tests/test-1.c
+++ b/libpthread/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/libpthread/tests/test-16.c b/libpthread/tests/test-16.c
index b6a52d01..3660f5f7 100644
--- a/libpthread/tests/test-16.c
+++ b/libpthread/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/libpthread/tests/test-6.c b/libpthread/tests/test-6.c
index 98aa8ba7..edf2919e 100644
--- a/libpthread/tests/test-6.c
+++ b/libpthread/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/libpthread/tests/test-7.c b/libpthread/tests/test-7.c
index bd97acfa..8159be34 100644
--- a/libpthread/tests/test-7.c
+++ b/libpthread/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>