[xorg-commit-diffs] xc/programs/Xserver/miext/rootless/safeAlpha safeAlphaWindow.c, 1.1.4.4, 1.1.4.5

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/miext/rootless/safeAlpha
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/miext/rootless/safeAlpha

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


Index: safeAlphaWindow.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.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/safeAlphaWindow.c	5 Mar 2004 13:41:10 -0000	1.1.4.4
+++ b/safeAlphaWindow.c	15 Apr 2004 10:17:23 -0000	1.1.4.5
@@ -38,7 +38,7 @@
 #include "safeAlpha.h"
 #include "rootlessCommon.h"
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #endif
@@ -69,7 +69,7 @@
     int         yRot = pDrawable->y;
     FbBits      planeMask;
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
     if(!noPanoramiXExtension)
     {
         int index = pDrawable->pScreen->myNum;