From 830de3f51a0289e043b1a457480cbbf2fab84798 Mon Sep 17 00:00:00 2001 From: Roland Mainz Date: Wed, 12 Jan 2005 02:55:30 +0000 Subject: xc/include/Xos.h //bugs.freedesktop.org/show_bug.cgi?id=2207) attachment #1623 (https://bugs.freedesktop.org/attachment.cgi?id=1623): Replace usag of CPP symbol "linux" with "__linux__" to get the build working with gcc4.0 again. Patch by Egbert Eich . --- Xos.h | 4 ++-- Xthreads.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Xos.h b/Xos.h index 05060c7..15e107a 100644 --- a/Xos.h +++ b/Xos.h @@ -1,5 +1,5 @@ /* - * $XdotOrg: xc/include/Xos.h,v 1.1.4.4 2004/02/16 20:55:02 alanc Exp $ + * $XdotOrg: xc/include/Xos.h,v 1.2 2004/04/23 18:43:05 eich Exp $ * $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 diff --git a/Xthreads.h b/Xthreads.h index 8d4f4e8..5381899 100644 --- a/Xthreads.h +++ b/Xthreads.h @@ -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) -- cgit v1.2.3