about summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2004-07-21 23:14:58 +0000
committerRoland McGrath <roland@gnu.org>2004-07-21 23:14:58 +0000
commit4fb907b74125ddcfc6a6f06c999c1d3488061218 (patch)
treef740386ac46f46656682d1fcd0d34c049fa5a59f /nptl
parent58c2859f14926dd965499eecdd4b9a41e0a1871b (diff)
downloadglibc-4fb907b74125ddcfc6a6f06c999c1d3488061218.tar.gz
glibc-4fb907b74125ddcfc6a6f06c999c1d3488061218.tar.xz
glibc-4fb907b74125ddcfc6a6f06c999c1d3488061218.zip
* Makefile ($(objpfx)multidir.mk): Use $(make-target-directory).
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog8
-rw-r--r--nptl/tst-cancel4.c7
2 files changed, 13 insertions, 2 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 44af273384..b24fde12a7 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,11 @@
+2004-07-21  Roland McGrath  <roland@redhat.com>
+
+	* Makefile ($(objpfx)multidir.mk): Use $(make-target-directory).
+
+2004-07-19  Roland McGrath  <roland@redhat.com>
+
+	* tst-cancel4.c (tf_waitid): Use WEXITED flag bit if available.
+
 2004-07-02  Roland McGrath  <roland@redhat.com>
 
 	* configure: Don't exit.
diff --git a/nptl/tst-cancel4.c b/nptl/tst-cancel4.c
index 87000fa6a4..8dc8aec0af 100644
--- a/nptl/tst-cancel4.c
+++ b/nptl/tst-cancel4.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -673,8 +673,11 @@ tf_waitid (void *arg)
   int s;
   pthread_cleanup_push (cl, NULL);
 
+#ifndef WEXITED
+# define WEXITED 0
+#endif
   siginfo_t si;
-  s = waitid (P_PID, pid, &si, 0);
+  s = waitid (P_PID, pid, &si, WEXITED);
 
   pthread_cleanup_pop (0);