backing out 390912, not sure what's wrong with linux

gfx/cairo/libpixman/src/pixman-edge-imp.h

@@ -1,4 +1,5 @@
 /*
+ * $Id: pixman-edge-imp.h,v 1.5 2007/08/07 01:52:15 vladimir%pobox.com Exp $
  *
  * Copyright © 2004 Keith Packard
  *
@@ -34,8 +35,8 @@ rasterizeEdges (pixman_image_t  *image,
     pixman_fixed_t  y = t;
     uint32_t  *line;
     uint32_t *buf = (image)->bits.bits;
-    int32_t stride = (image)->bits.rowstride;
-    int32_t width = (image)->bits.width;
+    uint32_t stride = (image)->bits.rowstride;
+    uint32_t width = (image)->bits.width;
     
     line = buf + pixman_fixed_to_int (y) * stride;
     

gfx/cairo/libpixman/src/pixman-edge.c

@@ -1,4 +1,5 @@
 /*
+ * $Id: pixman-edge.c,v 1.7 2007/08/07 01:52:15 vladimir%pobox.com Exp $
  *
  * Copyright © 2004 Keith Packard
  *
@@ -132,7 +133,7 @@ fbRasterizeEdges8 (pixman_image_t       *image,
     int fill_size = 0;
     uint32_t *buf = (image)->bits.bits;		
     int32_t stride = (image)->bits.rowstride;	
-    int32_t width = (image)->bits.width;
+    uint32_t width = (image)->bits.width;
     
     line = buf + pixman_fixed_to_int (y) * stride;
     

gfx/cairo/libpixman/src/pixman-private.h

@@ -658,7 +658,7 @@ union pixman_image
     do {								\
 	size_t _i;							\
 	uint8_t *_dst = (uint8_t*)(dst);				\
-	for(_i = 0; _i < (size_t) size; _i++) {                          \
+	for(_i = 0; _i < size; _i++) {					\
 	    WRITE(_dst +_i, (val));					\
 	}								\
     } while (0)

gfx/cairo/libpixman/src/pixman-trap.c

@@ -1,4 +1,5 @@
 /*
+ * $Id: pixman-trap.c,v 1.7 2007/08/07 01:52:15 vladimir%pobox.com Exp $
  *
  * Copyright © 2004 Keith Packard
  *