diff options
author | Egbert Eich <eich@suse.de> | 2005-01-03 18:03:49 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2005-01-03 18:03:49 +0000 |
commit | 9df4ffce552a0f6eca47764a3f79b466629e8bab (patch) | |
tree | f7f4f982564db0540534f708e8ed451075efa8f1 | |
parent | dd82af84ed67f439444e75ea1d032c082e15db51 (diff) | |
download | xorg-proto-x11proto-9df4ffce552a0f6eca47764a3f79b466629e8bab.tar.gz |
gcc 4 doesn't like predeffines line 'linux' any more. To muffle the
compiler replace them with __linux__ (Bugzilla #2207).
-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: xc/include/Xos.h,v 1.3 2004/11/15 15:06:53 ago Exp $ * $Xorg: Xos.h,v 1.6 2001/02/09 02:03:22 xorgcvs Exp $ * * @@ -277,7 +277,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 @@ -269,7 +269,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) |