[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/xaa xaaInitAccel.c, 1.1.4.1, 1.1.4.2 xaaOverlay.c, 1.1.4.4, 1.1.4.5 xaaPaintWin.c, 1.1.4.3, 1.1.4.4

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/xaa
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/xaa

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


Index: xaaInitAccel.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.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/xaaInitAccel.c	5 Mar 2004 13:40:58 -0000	1.1.4.1
+++ b/xaaInitAccel.c	15 Apr 2004 10:17:14 -0000	1.1.4.2
@@ -101,7 +101,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 1, 0,
 	ABI_CLASS_VIDEODRV,		/* requires the video driver ABI */
 	ABI_VIDEODRV_VERSION,

Index: xaaOverlay.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.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/xaaOverlay.c	5 Mar 2004 13:40:58 -0000	1.1.4.4
+++ b/xaaOverlay.c	15 Apr 2004 10:17:14 -0000	1.1.4.5
@@ -17,7 +17,7 @@
 #include "pixmapstr.h"
 #include "mioverlay.h"
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #endif
@@ -167,7 +167,7 @@
         xorg = pBgWin->drawable.x;
         yorg = pBgWin->drawable.y;
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 	if(!noPanoramiXExtension) {
 	    int index = pScreen->myNum;
 	    if(WindowTable[index] == pBgWin) {

Index: xaaPaintWin.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/xaaPaintWin.c	5 Mar 2004 13:40:58 -0000	1.1.4.3
+++ b/xaaPaintWin.c	15 Apr 2004 10:17:14 -0000	1.1.4.4
@@ -16,7 +16,7 @@
 #include "pixmapstr.h"
 #include "xaawrap.h"
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #endif
@@ -92,7 +92,7 @@
         xorg = pBgWin->drawable.x;
         yorg = pBgWin->drawable.y;
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 	if(!noPanoramiXExtension) {
 	    int index = pScreen->myNum;
 	    if(WindowTable[index] == pBgWin) {