Alexandre Julliard : ntdll: Use the __NR_ names for Linux system calls.

Alexandre Julliard julliard at winehq.org
Tue Jan 22 14:52:21 CST 2013


Module: wine
Branch: master
Commit: 606c88a348fa240359a25aa5a3659a0b41ee0cb4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=606c88a348fa240359a25aa5a3659a0b41ee0cb4

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jan 21 21:37:02 2013 +0100

ntdll: Use the __NR_ names for Linux system calls.

---

 dlls/ntdll/critsection.c |    4 ++--
 dlls/ntdll/directory.c   |    4 ++--
 dlls/ntdll/server.c      |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c
index fb69b31..dcc66e0 100644
--- a/dlls/ntdll/critsection.c
+++ b/dlls/ntdll/critsection.c
@@ -66,12 +66,12 @@ static int wake_op = 129; /*FUTEX_WAKE|FUTEX_PRIVATE_FLAG*/
 
 static inline int futex_wait( int *addr, int val, struct timespec *timeout )
 {
-    return syscall( SYS_futex, addr, wait_op, val, timeout, 0, 0 );
+    return syscall( __NR_futex, addr, wait_op, val, timeout, 0, 0 );
 }
 
 static inline int futex_wake( int *addr, int val )
 {
-    return syscall( SYS_futex, addr, wake_op, val, NULL, 0, 0 );
+    return syscall( __NR_futex, addr, wake_op, val, NULL, 0, 0 );
 }
 
 static inline int use_futexes(void)
diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c
index cc075b7..863a320 100644
--- a/dlls/ntdll/directory.c
+++ b/dlls/ntdll/directory.c
@@ -109,7 +109,7 @@ typedef struct
 # define O_DIRECTORY 0200000 /* must be directory */
 #endif
 
-#ifdef SYS_getdents64
+#ifdef __NR_getdents64
 typedef struct
 {
     ULONG64        d_ino;
@@ -121,7 +121,7 @@ typedef struct
 
 static inline int getdents64( int fd, char *de, unsigned int size )
 {
-    return syscall( SYS_getdents64, fd, de, size );
+    return syscall( __NR_getdents64, fd, de, size );
 }
 #define USE_GETDENTS
 #endif
diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c
index af2ce06..dd0d83e 100644
--- a/dlls/ntdll/server.c
+++ b/dlls/ntdll/server.c
@@ -962,7 +962,7 @@ static int get_unix_tid(void)
 #ifdef HAVE_PTHREAD_GETTHREADID_NP
     ret = pthread_getthreadid_np();
 #elif defined(linux)
-    ret = syscall( SYS_gettid );
+    ret = syscall( __NR_gettid );
 #elif defined(__sun)
     ret = pthread_self();
 #elif defined(__APPLE__)




More information about the wine-cvs mailing list