5 files changed, 7 insertions, 6 deletions
diff --git a/test/nptl/tst-cancel7.c b/test/nptl/tst-cancel7.c
index be9b1c606..16cc47cff 100644
--- a/test/nptl/tst-cancel7.c
+++ b/test/nptl/tst-cancel7.c
@@ -167,6 +167,7 @@ do_test (void)
   return r != PTHREAD_CANCELED;
 }
 
+#if 0 /* unused */
 static void
 do_cleanup (void)
 {
@@ -191,6 +192,7 @@ do_cleanup (void)
 
   unlink (pidfilename);
 }
+#endif
 
 #define OPT_COMMAND	10000
 #define OPT_PIDFILE	10001
diff --git a/test/nptl/tst-mqueue1.c b/test/nptl/tst-mqueue1.c
index 8a9c23cb8..70e42377b 100644
--- a/test/nptl/tst-mqueue1.c
+++ b/test/nptl/tst-mqueue1.c
@@ -72,7 +72,7 @@ do_one_test (mqd_t q, const char *name, int nonblock)
 {
   int result = 0;
 
-  unsigned char v []
+  char v []
     = { 0x32, 0x62, 0x22, 0x31, 0x11, 0x73, 0x61, 0x21, 0x72, 0x71, 0x81 };
 
   struct mq_attr attr;
@@ -190,7 +190,7 @@ do_one_test (mqd_t q, const char *name, int nonblock)
       else
 	result |= check_attrs (&attr, nonblock, 10);
 
-      unsigned char vr[11] = { };
+      char vr[11] = { };
       unsigned int prio;
       ssize_t rets;
 
@@ -414,4 +414,4 @@ do_test (void)
   return result;
 }
 
-#include "../test-skeleton.c"
-\ No newline at end of file
+#include "../test-skeleton.c"
diff --git a/test/nptl/tst-mqueue6.c b/test/nptl/tst-mqueue6.c
index 5a76bb59f..5c9ee69e1 100644
--- a/test/nptl/tst-mqueue6.c
+++ b/test/nptl/tst-mqueue6.c
@@ -138,7 +138,7 @@ do_test (void)
   memset (&ev, 0xaa, sizeof (ev));
   ev.sigev_notify = SIGEV_THREAD;
   ev.sigev_notify_function = fct;
-  ev.sigev_notify_attributes = (struct __pthread_attr_s *) &nattr;
+  ev.sigev_notify_attributes = &nattr;
   ev.sigev_value.sival_ptr = &q;
   if (mq_notify (q, &ev) != 0)
     {
diff --git a/test/nptl/tst-timer4.c b/test/nptl/tst-timer4.c
index edd8f712c..5bec01181 100644
--- a/test/nptl/tst-timer4.c
+++ b/test/nptl/tst-timer4.c
@@ -271,7 +271,7 @@ do_test (void)
   memset (&ev, 0x55, sizeof (ev));
   ev.sigev_notify = SIGEV_THREAD;
   ev.sigev_notify_function = thr2;
-  ev.sigev_notify_attributes = (struct __pthread_attr_s *) &nattr;
+  ev.sigev_notify_attributes = &nattr;
   ev.sigev_value.sival_int = 111;
   if (timer_create (TEST_CLOCK, &ev, &timer_thr2) != 0)
     {
diff --git a/test/nptl/tst-tls5.c b/test/nptl/tst-tls5.c
index 546253256..9ffc0a1e7 100644
--- a/test/nptl/tst-tls5.c
+++ b/test/nptl/tst-tls5.c
@@ -22,7 +22,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <pthread.h>
-#include <pthreadP.h>
 #include <sys/param.h>
 
 #include "tst-tls5.h"