[Xorg-commit] xc/lib/X11 ConnDis.c,1.1.4.3,1.1.4.4 Xlib.h,1.1.4.5,1.1.4.6

[Kaleb Keithley]

Committed by: kaleb

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

Modified Files:
      Tag: XORG-CURRENT
	ConnDis.c Xlib.h 
Log Message:
merge XFree86 RC2 (4.3.99.902) from vendor branch

Index: ConnDis.c
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/ConnDis.c,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- ConnDis.c	6 Dec 2003 13:24:22 -0000	1.1.4.3
+++ ConnDis.c	20 Dec 2003 00:28:22 -0000	1.1.4.4
@@ -25,7 +25,7 @@
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/X11/ConnDis.c,v 3.28 2003/12/02 23:33:17 herrb Exp $ */
+/* $XFree86: xc/lib/X11/ConnDis.c,v 3.29 2003/12/19 02:05:37 dawes Exp $ */
 
 /* 
  * This file contains operating system dependencies.
@@ -36,6 +36,7 @@
 #include <X11/Xlibint.h>
 #include <X11/Xtrans.h>
 #include <X11/Xauth.h>
+#include <X11/Xdmcp.h>
 #include <stdio.h>
 #include <ctype.h>
 

Index: Xlib.h
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/Xlib.h,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- Xlib.h	8 Dec 2003 16:42:30 -0000	1.1.4.5
+++ Xlib.h	20 Dec 2003 00:28:22 -0000	1.1.4.6
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /* $Xorg: Xlib.h,v 1.6 2001/02/09 02:03:38 xorgcvs Exp $ */
 /* 
 
@@ -24,7 +25,7 @@
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/X11/Xlib.h,v 3.25 2003/11/17 22:20:10 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Xlib.h,v 3.26 2003/12/18 16:38:35 dawes Exp $ */
 
 
 /*
@@ -52,6 +53,10 @@
 #endif
 #endif /* USG */
 
+#if defined(SCO325) || defined(__USLC__)
+#include <stdint.h>
+#endif
+
 #include <X11/X.h>
 
 /* applications should not depend on these two headers being included! */