Move include of pixman.h from cairo.h to cairoint.h since libpixman isn't part of cairo's public interface.

Use unsigned long rather than uint32_t since we no longer have pixman.h setting that type up for us.
Remove unused variable user_data_copy.

ChangeLog

@@ -1,3 +1,16 @@
+2005-04-08  Carl Worth  <cworth@cworth.org>
+
+	* src/cairoint.h: 
+	* src/cairo.h: Move include of pixman.h from cairo.h to cairoint.h
+	since libpixman isn't part of cairo's public interface.
+
+	* test/move-to-show-surface.c (draw): Use unsigned long rather
+	than uint32_t since we no longer have pixman.h setting that type
+	up for us.
+
+	* src/cairo-font.c (cairo_font_face_destroy): Remove unused
+	variable user_data_copy.
+
 2005-04-08  Owen Taylor  <otaylor@redhat.com>
 
 	* src/cairo.h src/cairo-font.c src/cairoint.h

src/cairo-font.c

@@ -76,8 +76,6 @@ cairo_font_face_reference (cairo_font_face_t *font_face)
 void
 cairo_font_face_destroy (cairo_font_face_t *font_face)
 {
-    cairo_user_data_array_t user_data_copy;
-  
     if (--(font_face->refcount) > 0)
 	return;
 

src/cairo.h

@@ -46,7 +46,6 @@
 #endif
 
 #include <cairo-features.h>
-#include <pixman.h>
 
 CAIRO_BEGIN_DECLS
 

src/cairoint.h

@@ -61,6 +61,7 @@
 #include <stdio.h>
 
 #include "cairo.h"
+#include <pixman.h>
 
 #if __GNUC__ >= 3 && defined(__ELF__)
 # define slim_hidden_proto(name)	slim_hidden_proto1(name, INT_##name)

test/move-to-show-surface.c

@@ -43,7 +43,6 @@
  *
  */
 
-
 #include "cairo-test.h"
 
 cairo_test_t test = {
@@ -56,7 +55,7 @@ static cairo_test_status_t
 draw (cairo_t *cr, int width, int height)
 {
     cairo_surface_t *surface;
-    uint32_t colors[4] = {
+    unsigned long colors[4] = {
 	0xffffffff, 0xffff0000,
 	0xff00ff00, 0xff0000ff
     };