pixman: Branch 'master'

[Andrea Canciani]

 test/composite.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 0f6a4d45886d64b244d57403609f0377b58cc7fb
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Thu May 5 10:17:08 2011 +0200

    test: Fix compilation on win32
    
    MSVC complains about uint32_t being used as an expression:
    
    composite.c(902) : error C2275: 'uint32_t' : illegal use of this type
    as an expression

diff --git a/test/composite.c b/test/composite.c
index 9a001e5..edea9a9 100644
--- a/test/composite.c
+++ b/test/composite.c
@@ -877,7 +877,7 @@ main (int argc, char **argv)
 {
 #define N_TESTS (8 * 1024 * 1024)
     int result = 0;
-    uint32_t i;
+    uint32_t i, seed;
 
     if (argc > 1)
     {
@@ -899,8 +899,6 @@ main (int argc, char **argv)
 	}
     }
 
-    uint32_t seed;
-    
     if (getenv ("PIXMAN_RANDOMIZE_TESTS"))
 	seed = get_random_seed();
     else