Module Name: xsrc
Committed By: mrg
Date: Mon Nov 9 04:32:07 UTC 2009
Modified Files:
xsrc/external/mit/xorg-server/dist/Xext: panoramiX.h
xsrc/external/mit/xorg-server/dist/dix: getevents.c
xsrc/external/mit/xorg-server/dist/xkb: ddxFakeMtn.c
Log Message:
handle Xinerama update for now.
XXX: back out when the rest is updated
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xorg-server/dist/Xext/panoramiX.h
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xorg-server/dist/dix/getevents.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xorg-server/dist/xkb/ddxFakeMtn.c
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/dist/Xext/panoramiX.h
diff -u xsrc/external/mit/xorg-server/dist/Xext/panoramiX.h:1.1.1.2 xsrc/external/mit/xorg-server/dist/Xext/panoramiX.h:1.2
--- xsrc/external/mit/xorg-server/dist/Xext/panoramiX.h:1.1.1.2 Thu Jun 11 01:52:56 2009
+++ xsrc/external/mit/xorg-server/dist/Xext/panoramiX.h Mon Nov 9 04:32:06 2009
@@ -41,6 +41,8 @@
#define _PANORAMIX_H_
#define _PANORAMIX_SERVER
+/* XXXMRG before xext* update */
+#include <X11/extensions/XKBsrv.h>
#include <X11/extensions/panoramiXext.h>
#undef _PANORAMIX_SERVER
Index: xsrc/external/mit/xorg-server/dist/dix/getevents.c
diff -u xsrc/external/mit/xorg-server/dist/dix/getevents.c:1.1.1.2 xsrc/external/mit/xorg-server/dist/dix/getevents.c:1.2
--- xsrc/external/mit/xorg-server/dist/dix/getevents.c:1.1.1.2 Thu Jun 11 01:52:54 2009
+++ xsrc/external/mit/xorg-server/dist/dix/getevents.c Mon Nov 9 04:32:07 2009
@@ -44,16 +44,25 @@
#include "dixevents.h"
#include "mipointer.h"
+/* XXXMRG before xext* update */
+/*
#ifdef XKB
#include <X11/extensions/XKBproto.h>
#include <xkbsrv.h>
#endif
+*/
#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
#endif
+/* XXXMRG before xext* update */
+#ifdef XKB
+#include <X11/extensions/XKBproto.h>
+#include <xkbsrv.h>
+#endif
+
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
#include "exglobals.h"
Index: xsrc/external/mit/xorg-server/dist/xkb/ddxFakeMtn.c
diff -u xsrc/external/mit/xorg-server/dist/xkb/ddxFakeMtn.c:1.1.1.2 xsrc/external/mit/xorg-server/dist/xkb/ddxFakeMtn.c:1.2
--- xsrc/external/mit/xorg-server/dist/xkb/ddxFakeMtn.c:1.1.1.2 Thu Jun 11 01:52:55 2009
+++ xsrc/external/mit/xorg-server/dist/xkb/ddxFakeMtn.c Mon Nov 9 04:32:07 2009
@@ -36,7 +36,8 @@
#include "inputstr.h"
#include "scrnintstr.h"
#include "windowstr.h"
-#include <xkbsrv.h>
+/* XXXMRG before xext* update */
+/* #include <xkbsrv.h> */
#include <X11/extensions/XI.h>
#ifdef PANORAMIX
@@ -44,6 +45,9 @@
#include "panoramiXsrv.h"
#endif
+/* XXXMRG before xext* update */
+#include <xkbsrv.h>
+
#include "mipointer.h"
#include "mipointrst.h"
