* tst-join5.c (tf1, tf2): Add a cast.

	* Makeconfig (includes): Append -I$(..)nptl to this variable.

	* tst-barrier2.c (do_test) [! _POSIX_THREAD_PROCESS_SHARED]:
	Don't test anything.
	* tst-cond4.c: Likewise.
	* tst-cond6.c: Likewise.
	* tst-flock2.c: Likewise.
	* tst-mutex4.c: Likewise.
	* tst-rwlock4.c: Likewise.
	* tst-signal1.c: Likewise.
	* tst-spin2.c: Likewise.
	* tst-cond11.c [! _POSIX_CLOCK_SELECTION]: Likewise.

	* tst-mutex4.c: Use test-skeleton.c.
	* tst-spin2.c: Likewise.
	* tst-sysconf.c: Likewise.
	* tst-barrier2.c: Likewise.
	* tst-cond4.c: Likewise.
	* tst-cond6.c: Likewise.
	* tst-rwlock4.c: Likewise.
	* tst-unload.c: Likewise.
	* tst-flock2.c (do_test): Use return instead of exit.

1 files changed, 9 insertions, 6 deletions

diff --git a/nptl/tst-unload.c b/nptl/tst-unload.c
index 4494ce88c7..ca779fe1b5 100644
--- a/nptl/tst-unload.c
+++ b/nptl/tst-unload.c
@@ -1,5 +1,5 @@
 /* Tests for non-unloading of libpthread.
-   Copyright (C) 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2000.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -22,24 +22,27 @@
 #include <stdlib.h>
 #include <gnu/lib-names.h>
 
-int
-main (void)
+static int
+do_test (void)
 {
   void *p = dlopen (PREFIX LIBPTHREAD_SO, RTLD_LAZY);
 
   if (p == NULL)
     {
       puts ("failed to load " LIBPTHREAD_SO);
-      exit (1);
+      return 1;
     }
 
   if (dlclose (p) != 0)
     {
       puts ("dlclose (" LIBPTHREAD_SO ") failed");
-      exit (1);
+      return 1;
     }
 
   puts ("seems to work");
 
-  exit (0);
+  return 0;
 }
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"