summaryrefslogtreecommitdiff
path: root/libio
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2017-07-03 15:43:51 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2017-08-21 15:37:45 -0300
commita8410a5fc9305c316633a5a3033f3927b759be35 (patch)
tree95e1966f5cb3d8fac5cbca59b33bce38720e4120 /libio
parent7369800c04f3c0fb9fb15821feb10a7976425aca (diff)
downloadglibc-a8410a5fc9305c316633a5a3033f3927b759be35.tar.gz
Consolidate non cancellable waitpid call
This patch consolidates all the non cancellable waitpid calls to use the __waitpid_nocancel identifier. For non cancellable targets it will be just a macro to call the default respective symbol while on Linux will be a internal one. Checked on x86_64-linux-gnu, x86_64-linux-gnu-x32, and i686-linux-gnu. * libio/ioopen.c (_IO_waitpid): Replace waitpid_not_cancel with __waitpid_nocancel. * sysdeps/generic/not-cancel.h (waitpid_not_cancel): Remove macro. (__waitpid_nocancel): New macro. * sysdeps/unix/sysv/linux/not-cancel.h (waitpid_not_cancel): Remove macro. (__waitpid_nocancel): Replace macro with a function. * sysdeps/unix/sysv/linux/waitpid.c (__waitpid_nocancel): New function.
Diffstat (limited to 'libio')
-rw-r--r--libio/iopopen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libio/iopopen.c b/libio/iopopen.c
index 0c20cbbfe2..a2ddebb32b 100644
--- a/libio/iopopen.c
+++ b/libio/iopopen.c
@@ -61,7 +61,7 @@ extern int _IO_dup2 (int fd, int fd2) __THROW;
#ifndef _IO_waitpid
#ifdef _LIBC
-#define _IO_waitpid waitpid_not_cancel
+#define _IO_waitpid __waitpid_nocancel
#else
#define _IO_waitpid waitpid
#endif