[xorg-commit-diffs] xc/programs/Xserver/XTrap xf86XTrapModule.c, 1.1.4.1, 1.1.4.2 xtrapdi.c, 1.1.4.4, 1.1.4.5

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/XTrap
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/XTrap

Modified Files:
      Tag: XORG-CURRENT
	xf86XTrapModule.c xtrapdi.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: xf86XTrapModule.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/XTrap/xf86XTrapModule.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/xf86XTrapModule.c	5 Mar 2004 13:39:50 -0000	1.1.4.1
+++ b/xf86XTrapModule.c	15 Apr 2004 10:15:40 -0000	1.1.4.2
@@ -27,7 +27,7 @@
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     1, 0, 0,
     ABI_CLASS_EXTENSION,         /* needs the server extension ABI */
     ABI_EXTENSION_VERSION,

Index: xtrapdi.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/XTrap/xtrapdi.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/xtrapdi.c	5 Mar 2004 13:39:50 -0000	1.1.4.4
+++ b/xtrapdi.c	15 Apr 2004 10:15:40 -0000	1.1.4.5
@@ -77,7 +77,7 @@
 #include <X11/extensions/xtrapddmi.h>
 #include <X11/extensions/xtrapproto.h>
 #include "colormapst.h"
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #include "cursor.h"
@@ -1559,7 +1559,7 @@
             /* Copy the event information into our local memory */
             (void)memcpy(&(data.u.event),x_event,sizeof(xEvent));
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 	    if (!noPanoramiXExtension &&
                 (data.u.event.u.u.type == MotionNotify ||
                 data.u.event.u.u.type == ButtonPress ||