Module Name: xsrc Committed By: mrg Date: Tue Aug 2 08:13:48 UTC 2011
Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h xorg-server.h Log Message: finish updating these for xorg-server 1.10.3 To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xorg-server/include/dix-config.h cvs rdiff -u -r1.9 -r1.10 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.17 xsrc/external/mit/xorg-server/include/dix-config.h:1.18 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.17 Tue Aug 2 07:22:05 2011 +++ xsrc/external/mit/xorg-server/include/dix-config.h Tue Aug 2 08:13:48 2011 @@ -349,7 +349,7 @@ /* #undef XORG_RELEASE */ /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 10000000) + ((9) * 100000) + ((5) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 10000000) + ((10) * 100000) + ((3) * 1000) + 0) /* Xorg release date */ #define XORG_DATE "2010-10-30" @@ -394,7 +394,9 @@ /* #undef ROOTLESS */ /* Define to 1 if unsigned long is 64 bits. */ +#ifdef _LP64 #define _XSERVER64 1 +#endif /* System is BSD-like */ #define CSRG_BASED 1 Index: xsrc/external/mit/xorg-server/include/xorg-server.h diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.9 xsrc/external/mit/xorg-server/include/xorg-server.h:1.10 --- xsrc/external/mit/xorg-server/include/xorg-server.h:1.9 Tue Aug 2 07:22:05 2011 +++ xsrc/external/mit/xorg-server/include/xorg-server.h Tue Aug 2 08:13:48 2011 @@ -120,7 +120,7 @@ /* #undef XORG_RELEASE */ /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 10000000) + ((9) * 100000) + ((5) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 10000000) + ((10) * 100000) + ((3) * 1000) + 0) /* Build Xv Extension */ #define XvExtension 1