Module Name: xsrc
Committed By: mrg
Date: Tue Aug 2 07:22:05 UTC 2011
Modified Files:
xsrc/external/mit/xorg-server/include: dix-config.h version-config.h
xf86Build.h xorg-config.h xorg-server.h
Log Message:
updates for xorg-server 1.10.3.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorg-server/include/version-config.h
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/include/xf86Build.h
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xorg-server/include/xorg-config.h
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xorg-server/include/xorg-server.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/include/dix-config.h
diff -u xsrc/external/mit/xorg-server/include/dix-config.h:1.16 xsrc/external/mit/xorg-server/include/dix-config.h:1.17
--- xsrc/external/mit/xorg-server/include/dix-config.h:1.16 Sun Jul 24 01:41:27 2011
+++ xsrc/external/mit/xorg-server/include/dix-config.h Tue Aug 2 07:22:05 2011
@@ -244,6 +244,9 @@
/* Define to 1 if you have the `vprintf' function. */
#define HAVE_VPRINTF 1
+/* Define to 1 if you have the `vasprintf' function. */
+#define HAVE_VASPRINTF 1
+
/* Support IPv6 for TCP connections */
#define IPv6 1
@@ -441,6 +444,9 @@
/* Define to 1 if you have the `ffs' function. */
#define HAVE_FFS 1
+/* If the compiler supports a TLS storage class define it to that here */
+/* #undef TLS */
+
/* Correctly set _XSERVER64 for OSX fat binaries */
#ifdef __APPLE__
#include "dix-config-apple-verbatim.h"
Index: xsrc/external/mit/xorg-server/include/version-config.h
diff -u xsrc/external/mit/xorg-server/include/version-config.h:1.2 xsrc/external/mit/xorg-server/include/version-config.h:1.3
--- xsrc/external/mit/xorg-server/include/version-config.h:1.2 Sun Jul 24 01:41:27 2011
+++ xsrc/external/mit/xorg-server/include/version-config.h Tue Aug 2 07:22:05 2011
@@ -5,13 +5,13 @@
#define VERSION_CONFIG_H
/* Vendor man version */
-#define VENDOR_MAN_VERSION "Version 1.9.5"
+#define VENDOR_MAN_VERSION "Version 1.10.3"
/* Vendor name */
/* #define VENDOR_NAME "The X.Org Foundation" */
/* Vendor release */
-#define VENDOR_RELEASE (((1) * 10000000) + ((9) * 100000) + ((5) * 1000) + 0)
+#define VENDOR_RELEASE (((1) * 10000000) + ((10) * 100000) + ((3) * 1000) + 0)
#endif /* VERSION_CONFIG_H */
Index: xsrc/external/mit/xorg-server/include/xf86Build.h
diff -u xsrc/external/mit/xorg-server/include/xf86Build.h:1.5 xsrc/external/mit/xorg-server/include/xf86Build.h:1.6
--- xsrc/external/mit/xorg-server/include/xf86Build.h:1.5 Sun Jul 24 01:41:27 2011
+++ xsrc/external/mit/xorg-server/include/xf86Build.h Tue Aug 2 07:22:05 2011
@@ -1,2 +1,2 @@
-#define BUILD_DATE 20110723
-#define BUILD_TIME 1013305
+#define BUILD_DATE 20110801
+#define BUILD_TIME 1010100
Index: xsrc/external/mit/xorg-server/include/xorg-config.h
diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.11 xsrc/external/mit/xorg-server/include/xorg-config.h:1.12
--- xsrc/external/mit/xorg-server/include/xorg-config.h:1.11 Sun Jul 24 01:41:27 2011
+++ xsrc/external/mit/xorg-server/include/xorg-config.h Tue Aug 2 07:22:05 2011
@@ -17,7 +17,7 @@
#define XORGSERVER 1
/* Current X.Org version. */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((9) * 100000) + ((5) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((10) * 100000) + ((3) * 1000) + 0)
/* Name of X server. */
#define __XSERVERNAME__ "Xorg"
Index: xsrc/external/mit/xorg-server/include/xorg-server.h
diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.8 xsrc/external/mit/xorg-server/include/xorg-server.h:1.9
--- xsrc/external/mit/xorg-server/include/xorg-server.h:1.8 Sun Jul 24 01:41:27 2011
+++ xsrc/external/mit/xorg-server/include/xorg-server.h Tue Aug 2 07:22:05 2011
@@ -158,11 +158,6 @@
/* Name of X server */
#define __XSERVERNAME__ "Xorg"
-#if defined(_LP64)
-/* Define to 1 if unsigned long is 64 bits. */
-#define _XSERVER64 1
-#endif
-
/* Building vgahw module */
#define WITH_VGAHW 1
@@ -190,4 +185,8 @@
/* X Access Control Extension */
#define XACE 1
+#ifdef _LP64
+#define _XSERVER64 1
+#endif
+
#endif /* _XORG_SERVER_H_ */
