[cairo-commit] cairo/pixman/src fbpict.c,1.7,1.8

[Christian Biesinger]

Committed by: biesi

Update of /cvs/cairo/cairo/pixman/src
In directory gabe:/tmp/cvs-serv22658/pixman/src

Modified Files:
	fbpict.c 
Log Message:
2006-01-21  Christian Biesinger  <cbiesinger at web.de>

	* pixman/src/fbpict.c: (detectCPUFeatures):
	* src/cairo-paginated-surface.c:
	(_cairo_paginated_surface_get_target):
	* test/cairo-test.c: (create_image_surface):

	Don't mix declarations and code. This makes the code valid ISO C,
	fixes a gcc -pedantic warning, and unbreaks the build with the
	compiler Zeta ships with.


Index: fbpict.c
===================================================================
RCS file: /cvs/cairo/cairo/pixman/src/fbpict.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- fbpict.c	19 Sep 2005 02:34:36 -0000	1.7
+++ fbpict.c	21 Jan 2006 17:39:11 -0000	1.8
@@ -1927,7 +1927,7 @@
 };
 
 static unsigned int detectCPUFeatures(void) {
-    unsigned int result;
+    unsigned int result, features;
     char vendor[13];
     vendor[0] = 0;
     vendor[12] = 0;
@@ -1973,7 +1973,7 @@
              : "%eax", "%ecx", "%edx"
         );
 
-    unsigned int features = 0;
+    features = 0;
     if (result) {
         /* result now contains the standard feature bits */
         if (result & (1 << 15))