[xorg-commit-diffs] xc/programs/Xserver/fb fbmodule.c, 1.1, 1.1.4.1 fbwindow.c, 1.1.4.4, 1.1.4.5

[Egbert Eich]

Committed by: eich

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

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


Index: fbmodule.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbmodule.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/fbmodule.c	14 Nov 2003 16:48:54 -0000	1.1
+++ b/fbmodule.c	15 Apr 2004 10:15:46 -0000	1.1.4.1
@@ -36,7 +36,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: fbwindow.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbwindow.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/fbwindow.c	5 Mar 2004 13:39:57 -0000	1.1.4.4
+++ b/fbwindow.c	15 Apr 2004 10:15:46 -0000	1.1.4.5
@@ -224,7 +224,7 @@
     }
 }
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #endif
@@ -248,7 +248,7 @@
     int		xRot = pDrawable->x;
     int		yRot = pDrawable->y;
     
-#ifdef XINERAMA
+#ifdef PANORAMIX
     if(!noPanoramiXExtension) 
     {
 	int index = pDrawable->pScreen->myNum;