fdo-mirrors/xorg-xorgproto
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/proto/xorgproto.git synced 2026-05-07 20:08:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gcc 4 doesn't like predeffines line 'linux' any more. To muffle the

Browse source 
compiler replace them with __linux__ (Bugzilla #2207).
This commit is contained in:
Egbert Eich 2005-01-03 18:03:49 +00:00
parent dd82af84ed
commit 9df4ffce55
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Xos.h
View file

@ -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

2
Xthreads.h
View file

@ -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)