From 6b6ede3d15f04fe825cfa9f697507457e3640344 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 14 Feb 2015 23:00:19 -0600 Subject: resolve merge --- libc/sysdeps/linux/common/not-cancel.h | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'libc/sysdeps/linux/common/not-cancel.h') diff --git a/libc/sysdeps/linux/common/not-cancel.h b/libc/sysdeps/linux/common/not-cancel.h index acf8e39e8..ac32366a6 100644 --- a/libc/sysdeps/linux/common/not-cancel.h +++ b/libc/sysdeps/linux/common/not-cancel.h @@ -70,12 +70,6 @@ extern int __openat64_nocancel (int fd, const char *fname, int oflag, #define read_not_cancel(fd, buf, n) \ INLINE_SYSCALL (read, 3, (fd), (buf), (n)) -#ifdef __LINUXTHREADS_NEW__ -/* Uncancelable write. */ -#define write_not_cancel(fd, buf, n) \ - INLINE_SYSCALL (write, 3, (fd), (buf), (n)) -#endif - #if 0 /* Uncancelable writev. */ #define writev_not_cancel_no_status(fd, iov, n) \ @@ -87,17 +81,6 @@ extern int __openat64_nocancel (int fd, const char *fname, int oflag, __fcntl_nocancel (fd, cmd, val) #endif -#ifdef __LINUXTHREADS_NEW__ -/* Uncancelable waitpid. */ -#if 0 /*def __NR_waitpid*/ -# define waitpid_not_cancel(pid, stat_loc, options) \ - INLINE_SYSCALL (waitpid, 3, pid, stat_loc, options) -#else -# define waitpid_not_cancel(pid, stat_loc, options) \ - INLINE_SYSCALL (wait4, 4, pid, stat_loc, options, NULL) -#endif -#endif - /* Uncancelable pause. */ #ifdef __NR_pause # define pause_not_cancel() \ -- cgit v1.2.3