[xorg-commit-diffs] xc/programs/Xserver/record record.c, 1.1.4.5, 1.1.4.6 recordmod.c, 1.1.4.1, 1.1.4.2

[Egbert Eich]

Committed by: eich

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

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


Index: record.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/record/record.c,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/record.c	5 Mar 2004 13:41:11 -0000	1.1.4.5
+++ b/record.c	15 Apr 2004 10:17:34 -0000	1.1.4.6
@@ -27,7 +27,7 @@
 other dealings in this Software without prior written authorization
 from The Open Group.
 
-Author: David P. Wiggins, X Consortium, Inc.
+Author: David P. Wiggins, The Open Group
 
 This work benefited from earlier work done by Martha Zimet of NCD
 and Jim Haggerty of Metheus.
@@ -49,7 +49,7 @@
 #include "xf86_ansic.h"
 #endif
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "globals.h"
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
@@ -871,7 +871,7 @@
 		    {
 		        xEvent swappedEvent;
 		        xEvent *pEvToRecord = pev;
-#ifdef XINERAMA
+#ifdef PANORAMIX
 		        xEvent shiftedEvent;
 
 			if (!noPanoramiXExtension &&
@@ -890,7 +890,7 @@
 					panoramiXdataPtr[0].y;
 				pEvToRecord = &shiftedEvent;
 			}
-#endif /* XINERAMA */
+#endif /* PANORAMIX */
 
 			if (pContext->pRecordingClient->swapped)
 			{

Index: recordmod.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/record/recordmod.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/recordmod.c	5 Mar 2004 13:41:11 -0000	1.1.4.1
+++ b/recordmod.c	15 Apr 2004 10:17:34 -0000	1.1.4.2
@@ -21,7 +21,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 13, 0,
 	ABI_CLASS_EXTENSION,
 	ABI_EXTENSION_VERSION,