[Xorg-commit] xc/include Xos.h,1.1.4.4,1.1.4.5

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/include
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/include

Modified Files:
      Tag: XORG-CURRENT
	Xos.h 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: Xos.h
===================================================================
RCS file: /cvs/xorg/xc/include/Xos.h,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/Xos.h	16 Feb 2004 20:55:02 -0000	1.1.4.4
+++ b/Xos.h	23 Feb 2004 21:33:46 -0000	1.1.4.5
@@ -28,7 +28,7 @@
  * 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 @@
 #endif
 #endif /* USG */
 
+#ifndef sgi
 #if defined(SCO325) || defined(__USLC__)
 #include <stdint.h>
 #endif
+#endif
 
 #ifdef _SEQUENT_
 /*