summaryrefslogtreecommitdiff
path: root/Xos.h
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-01-29 08:07:54 +0000
committerEgbert Eich <eich@suse.de>2004-01-29 08:07:54 +0000
commit0700ff31a84abc06fdf4b05c2328ff2329dc909c (patch)
tree3bda52fed2974524e4ab18e9c31b1e455b374355 /Xos.h
parentad76b5cc436937d9fb945bd43d9356651fe182ca (diff)
Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
Diffstat (limited to 'Xos.h')
-rw-r--r--Xos.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/Xos.h b/Xos.h
index ba81e2b..c25eeec 100644
--- a/Xos.h
+++ b/Xos.h
@@ -27,7 +27,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.
@@ -60,9 +60,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_
/*