GNU C Library master sources branch roland/waitpid created. glibc-2.19-429-g5c4f487

[roland at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, roland/waitpid has been created
        at  5c4f4870852cc3ec3080e3da9780c89a83f01275 (commit)

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5c4f4870852cc3ec3080e3da9780c89a83f01275

commit 5c4f4870852cc3ec3080e3da9780c89a83f01275
Author: Roland McGrath <roland@hack.frob.com>
Date:   Fri May 16 14:00:35 2014 -0700

    Fix __waitpid_nocancel link error.

diff --git a/ChangeLog b/ChangeLog
index 0840284..ac73e69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-05-16  Roland McGrath  <roland@hack.frob.com>
 
+	* sysdeps/unix/sysv/linux/not-cancel.h (waitpid_not_cancel):
+	Use wait4 regardless of [__NR_waitpid].
+
 	* sysdeps/unix/sysv/linux/arm/arch-fork.h: New file.
 	* sysdeps/unix/sysv/linux/arm/fork.c: File removed.
 
diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h
index bc17107..14f5e8b 100644
--- a/sysdeps/unix/sysv/linux/not-cancel.h
+++ b/sysdeps/unix/sysv/linux/not-cancel.h
@@ -83,13 +83,8 @@ extern int __openat64_nocancel (int fd, const char *fname, int oflag,
   __fcntl_nocancel (fd, cmd, val)
 
 /* Uncancelable waitpid.  */
-#ifdef __NR_waitpid
-# define waitpid_not_cancel(pid, stat_loc, options) \
-  __waitpid_nocancel (pid, stat_loc, options)
-#else
-# define waitpid_not_cancel(pid, stat_loc, options) \
+#define waitpid_not_cancel(pid, stat_loc, options) \
   INLINE_SYSCALL (wait4, 4, pid, stat_loc, options, NULL)
-#endif
 
 /* Uncancelable pause.  */
 #define pause_not_cancel() \

-----------------------------------------------------------------------


hooks/post-receive
-- 
GNU C Library master sources