summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKean Johnson <kean@armory.com>2005-11-08 06:33:25 +0000
committerKean Johnson <kean@armory.com>2005-11-08 06:33:25 +0000
commit6bb0c3796b6e1beddc376a896e865704886e1462 (patch)
tree6cac858c83fbce90d50d76c7dd28e3a1a88cd1d6 /include
parent14be0098ad90c3e68bd2d21b00ffabb76f1fd780 (diff)
See ChangeLog entry 2005-11-07 for details.
Diffstat (limited to 'include')
-rw-r--r--include/X11/Xlib.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/X11/Xlib.h b/include/X11/Xlib.h
index bb2aaa2..a26789b 100644
--- a/include/X11/Xlib.h
+++ b/include/X11/Xlib.h
@@ -1,4 +1,4 @@
-/* $XdotOrg: lib/X11/include/X11/Xlib.h,v 1.5 2005-07-03 07:00:55 daniels Exp $ */
+/* $XdotOrg: lib/X11/include/X11/Xlib.h,v 1.6 2005-11-08 06:33:25 jkj Exp $ */
/* $Xorg: Xlib.h,v 1.6 2001/02/09 02:03:38 xorgcvs Exp $ */
/*
@@ -53,7 +53,7 @@ in this Software without prior written authorization from The Open Group.
#endif
#endif /* USG */
-#if defined(SCO325) || defined(__USLC__)
+#if defined(__SCO__) || defined(__UNIXWARE__)
#include <stdint.h>
#endif
@@ -65,13 +65,11 @@ in this Software without prior written authorization from The Open Group.
#ifndef X_WCHAR
#ifdef X_NOT_STDC_ENV
-#ifndef SCO324
#ifndef ISC
#define X_WCHAR
#endif
#endif
#endif
-#endif
#ifndef X_WCHAR
#include <stddef.h>