pixman: Branch 'master'

[Søren Sandmann Pedersen]

 test/trap-test.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c882260d4b481283c3d59385bfa31bfeffc0a58f
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Tue Apr 28 22:49:31 2009 -0400

    Include string.h and fix warning in trap-test.c

diff --git a/test/trap-test.c b/test/trap-test.c
index 7750e5a..adf796d 100644
--- a/test/trap-test.c
+++ b/test/trap-test.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <gtk/gtk.h>
+#include <string.h>
 #include "pixman.h"
 
 GdkPixbuf *
@@ -21,7 +22,7 @@ pixbuf_from_argb32 (uint32_t *bits,
 	{
 	    uint32_t argb = bits[h * stride + w];
 	    guint r, g, b, a;
-	    char *pb = p_bits;
+	    char *pb = (char *)p_bits;
 
 	    pb += h * p_stride + w * 4;