[xorg-commit-diffs] xc/programs/Xserver/dbe dbe.c, 1.1.4.4, 1.1.4.5 dbemodule.c, 1.1.4.1, 1.1.4.2

[Egbert Eich]

Committed by: eich

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

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


Index: dbe.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/dbe/dbe.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/dbe.c	5 Mar 2004 13:39:56 -0000	1.1.4.4
+++ b/dbe.c	15 Apr 2004 10:15:45 -0000	1.1.4.5
@@ -1821,8 +1821,7 @@
     int			nStubbedScreens = 0;
     Bool		ddxInitSuccess;
 
-#ifdef XINERAMA
-    extern Bool noPanoramiXExtension;
+#ifdef PANORAMIX
     if(!noPanoramiXExtension) return;
 #endif
 

Index: dbemodule.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/dbe/dbemodule.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/dbemodule.c	5 Mar 2004 13:39:56 -0000	1.1.4.1
+++ b/dbemodule.c	15 Apr 2004 10:15:45 -0000	1.1.4.2
@@ -20,7 +20,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_EXTENSION,
 	ABI_EXTENSION_VERSION,