[xorg-commit-diffs] xc/programs/Xserver/GL/dri dri.c, 1.1.4.5, 1.1.4.6 drimodule.c, 1.1.4.2, 1.1.4.3

[Egbert Eich]

Committed by: eich

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

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


Index: dri.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/GL/dri/dri.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/dri.c	5 Mar 2004 13:39:47 -0000	1.1.4.5
+++ b/dri.c	15 Apr 2004 10:15:13 -0000	1.1.4.6
@@ -66,7 +66,7 @@
 #include "mi.h"
 #include "mipointer.h"
 
-#if defined(XFree86LOADER) && !defined(XINERAMA)
+#if defined(XFree86LOADER) && !defined(PANORAMIX)
 extern Bool noPanoramiXExtension;
 #endif
 
@@ -129,14 +129,14 @@
      * If Xinerama is on, don't allow DRI to initialise.  It won't be usable
      * anyway.
      */
-#if defined(XINERAMA) && !defined(XFree86LOADER)
+#if defined(PANORAMIX) && !defined(XFree86LOADER)
     xineramaInCore = TRUE;
 #elif defined(XFree86LOADER)
     if (xf86LoaderCheckSymbol("noPanoramiXExtension"))
 	xineramaInCore = TRUE;
 #endif
 
-#if defined(XINERAMA) || defined(XFree86LOADER)
+#if defined(PANORAMIX) || defined(XFree86LOADER)
     if (xineramaInCore) {
 	if (!noPanoramiXExtension) {
 	    DRIDrvMsg(pScreen->myNum, X_WARNING,

Index: drimodule.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/GL/dri/drimodule.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/drimodule.c	5 Mar 2004 13:39:47 -0000	1.1.4.2
+++ b/drimodule.c	15 Apr 2004 10:15:13 -0000	1.1.4.3
@@ -44,7 +44,7 @@
         MODULEVENDORSTRING,
         MODINFOSTRING1,
         MODINFOSTRING2,
-        XF86_VERSION_CURRENT,
+        XORG_VERSION_CURRENT,
         1, 0, 0,
         ABI_CLASS_EXTENSION,
         ABI_EXTENSION_VERSION,
@@ -110,7 +110,7 @@
 	}
 	else {
 	    LoaderReqSymLists(drmSymbols, NULL);
-	    LoaderRefSymbols("noXineramaExtension", NULL);
+	    LoaderRefSymbols("noPanoramiXExtension", NULL);
 	    LoadExtension(&XF86DRIExt, FALSE);
 	}
     } else {