summaryrefslogtreecommitdiff
path: root/Xos.h
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2005-01-03 18:03:49 +0000
committerEgbert Eich <eich@suse.de>2005-01-03 18:03:49 +0000
commit9df4ffce552a0f6eca47764a3f79b466629e8bab (patch)
treef7f4f982564db0540534f708e8ed451075efa8f1 /Xos.h
parentdd82af84ed67f439444e75ea1d032c082e15db51 (diff)
downloadxorg-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).
Diffstat (limited to 'Xos.h')
-rw-r--r--Xos.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/Xos.h b/Xos.h
index a7d8b2c..43141ba 100644
--- a/Xos.h
+++ b/Xos.h
@@ -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