diff options
author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2005-02-11 10:53:05 +0000 |
---|---|---|
committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2005-02-11 10:53:05 +0000 |
commit | eff162b5fca36542d7e0f1abdfc95fd9bfdb943b (patch) | |
tree | 1822132a51892916aa3819f806da7ef0ac908953 | |
parent | 4a33b396f2e336c6121b24c2b66bff96f1b5cab2 (diff) |
Import changes from XORG-6.8.2CYGWIN-6_8_2-MERGECYGWIN
-rw-r--r-- | Xos.h | 4 | ||||
-rw-r--r-- | Xthreads.h | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -1,5 +1,5 @@ /* - * $XdotOrg: xc/include/Xos.h,v 1.2 2004/04/23 18:43:05 eich Exp $ + * $XdotOrg$ * $Xorg: Xos.h,v 1.6 2001/02/09 02:03:22 xorgcvs Exp $ * * @@ -276,7 +276,7 @@ typedef unsigned long fd_mask; #endif #if defined(ISC) || defined(__UNIXOS2__) || \ - (defined(linux) && !defined(__GLIBC__)) || \ + (defined(__linux__) && !defined(__GLIBC__)) || \ (defined(__QNX__) && !defined(UNIXCONN)) /* * Some OS's may not have this @@ -267,7 +267,7 @@ static xthread_t _X_no_thread_id; #define xthread_clear_id(id) id = _X_no_thread_id #define xthread_equal(id1,id2) pthread_equal(id1, id2) #endif /* _DECTHREADS_ */ -#if defined(linux) +#if defined(__linux__) #define xthread_have_id(id) !pthread_equal(id, 0) #define xthread_clear_id(id) id = 0 #define xthread_equal(id1,id2) pthread_equal(id1, id2) |