[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/xf8_32bpp cfb8_32module.c, 1.1.4.1, 1.1.4.2 cfbpntwin.c, 1.1.4.3, 1.1.4.4

[Egbert Eich]

Committed by: eich

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

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


Index: cfb8_32module.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32module.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/cfb8_32module.c	5 Mar 2004 13:41:02 -0000	1.1.4.1
+++ b/cfb8_32module.c	15 Apr 2004 10:17:19 -0000	1.1.4.2
@@ -13,7 +13,7 @@
         MODULEVENDORSTRING,
         MODINFOSTRING1,
         MODINFOSTRING2,
-        XF86_VERSION_CURRENT,
+        XORG_VERSION_CURRENT,
         1, 0, 0,
         ABI_CLASS_ANSIC,                /* Only need the ansic layer */
         ABI_ANSIC_VERSION,

Index: cfbpntwin.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.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/cfbpntwin.c	5 Mar 2004 13:41:02 -0000	1.1.4.3
+++ b/cfbpntwin.c	15 Apr 2004 10:17:19 -0000	1.1.4.4
@@ -15,7 +15,7 @@
 #include "cfb8_32.h"
 #include "mi.h"
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #endif
@@ -44,7 +44,7 @@
 	case BackgroundPixmap:
 	    xorg = pWin->drawable.x;
 	    yorg = pWin->drawable.y;
-#ifdef XINERAMA
+#ifdef PANORAMIX
 	    if(!noPanoramiXExtension) {
 		int index = pWin->drawable.pScreen->myNum;
 		if(WindowTable[index] == pWin) {
@@ -92,7 +92,7 @@
 	    xorg = pBgWin->drawable.x;
 	    yorg = pBgWin->drawable.y;
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 	    if(!noPanoramiXExtension) {
 		int index = pWin->drawable.pScreen->myNum;
 		if(WindowTable[index] == pBgWin) {