Index: include/Xos.h
===================================================================
RCS file: /cvs/xorg/xc/include/Xos.h,v
retrieving revision 1.3
diff -u -r1.3 Xos.h
--- include/Xos.h	15 Nov 2004 15:06:53 -0000	1.3
+++ include/Xos.h	3 Jan 2005 17:56:55 -0000
@@ -277,7 +277,7 @@
 #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
Index: include/Xthreads.h
===================================================================
RCS file: /cvs/xorg/xc/include/Xthreads.h,v
retrieving revision 1.3
diff -u -r1.3 Xthreads.h
--- include/Xthreads.h	15 Nov 2004 15:06:53 -0000	1.3
+++ include/Xthreads.h	3 Jan 2005 17:56:55 -0000
@@ -269,7 +269,7 @@
 #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)