diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:33:46 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:33:46 +0000 |
| commit | 05c818e417ce168d512780ad99b8d601642a46cc (patch) | |
| tree | b15889f46815c4aab9f8e002ce0d826231c84835 | |
| parent | 79baa976cc84533c51dfc33e03fe2463bcc9dcd7 (diff) | |
| download | xorg-proto-x11proto-XINERAMA_2.tar.gz | |
merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214XORG-RELEASE-1-BASEXEVIE-MERGEXINERAMA_2
| -rw-r--r-- | Xos.h | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1,5 +1,5 @@ /* - * $XdotOrg: xc/include/Xos.h,v 1.1.4.3 2003/12/20 00:28:21 kaleb Exp $ + * $XdotOrg: xc/include/Xos.h,v 1.1.4.4 2004/02/16 20:55:02 alanc Exp $ * $Xorg: Xos.h,v 1.6 2001/02/09 02:03:22 xorgcvs Exp $ * * @@ -28,7 +28,7 @@ in this Software without prior written authorization from The Open Group. * The X Window System is a Trademark of The Open Group. * */ -/* $XFree86: xc/include/Xos.h,v 3.41 2003/12/19 02:05:37 dawes Exp $ */ +/* $XFree86: xc/include/Xos.h,v 3.42 2003/12/31 01:18:41 tsi Exp $ */ /* This is a collection of things to try and minimize system dependencies * in a "signficant" number of source files. @@ -61,9 +61,11 @@ in this Software without prior written authorization from The Open Group. #endif #endif /* USG */ +#ifndef sgi #if defined(SCO325) || defined(__USLC__) #include <stdint.h> #endif +#endif #ifdef _SEQUENT_ /* |