[xserver-commit] xserver/fb fbblt.c,1.12,1.13

Keith Packard xserver-commit@pdx.freedesktop.org
Sat, 27 Dec 2003 21:34:07 -0800 

Committed by: keithp

Update of /cvs/xserver/xserver/fb
In directory pdx:/tmp/cvs-serv15534/fb

Modified Files:
	fbblt.c 
Log Message:
2003-12-01  Keith Packard  <keithp@keithp.com>
	* fb/fbblt.c
	Move FbDeclareMergeRop back above statements to make non c++
	compilers happy.


Index: fbblt.c
===================================================================
RCS file: /cvs/xserver/xserver/fb/fbblt.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- fbblt.c	21 Dec 2003 09:21:05 -0000	1.12
+++ fbblt.c	28 Dec 2003 05:34:05 -0000	1.13
@@ -67,6 +67,7 @@
     int	    n, nmiddle;
     Bool    destInvarient;
     int	    startbyte, endbyte;
+    FbDeclareMergeRop ();
 
     if((pm==FB_ALLONES) && (alu==GXcopy) && !reverse && !upsidedown && ((bpp&7)==0))
     {
@@ -84,8 +85,6 @@
 		return;
     }
     
-    FbDeclareMergeRop ();
-
 #ifdef FB_24BIT
     if (bpp == 24 && !FbCheck24Pix (pm))
     {