From e1e46622ac0fce73d802fa4a8a2e83cc25cd9e7a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 14 Feb 2015 23:04:02 -0600 Subject: Revert "resolve merge" This reverts commit 6b6ede3d15f04fe825cfa9f697507457e3640344. --- libpthread/linuxthreads/sysdeps/pthread/not-cancel.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libpthread/linuxthreads/sysdeps/pthread/not-cancel.h') diff --git a/libpthread/linuxthreads/sysdeps/pthread/not-cancel.h b/libpthread/linuxthreads/sysdeps/pthread/not-cancel.h index bbdb0739c..b46d2ab49 100644 --- a/libpthread/linuxthreads/sysdeps/pthread/not-cancel.h +++ b/libpthread/linuxthreads/sysdeps/pthread/not-cancel.h @@ -23,10 +23,10 @@ /* Uncancelable open. */ #if defined __NR_openat && !defined __NR_open #define open_not_cancel(name, flags, mode) \ - INLINE_SYSCALL (openat, 4, AT_FDCWD, (const char *) (name), \ + INLINE_SYSCALL (openat, 4, (int) (AT_FDCWD), (const char *) (name), \ (flags), (mode)) #define open_not_cancel_2(name, flags) \ - INLINE_SYSCALL (openat, 3, AT_FDCWD, (const char *) (name), \ + INLINE_SYSCALL (openat, 3, (int) (AT_FDCWD), (const char *) (name), \ (flags)) #else #define open_not_cancel(name, flags, mode) \ -- cgit v1.2.3