[cairo-commit] cairo/test move-to-show-surface.c,1.5,1.6

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/test
In directory gabe:/tmp/cvs-serv13296/test

Modified Files:
	move-to-show-surface.c 
Log Message:

        * 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.


Index: move-to-show-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/test/move-to-show-surface.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- move-to-show-surface.c	6 Apr 2005 20:01:13 -0000	1.5
+++ move-to-show-surface.c	8 Apr 2005 21:06:32 -0000	1.6
@@ -43,7 +43,6 @@
  *
  */
 
-
 #include "cairo-test.h"
 
 cairo_test_t test = {
@@ -56,7 +55,7 @@
 draw (cairo_t *cr, int width, int height)
 {
     cairo_surface_t *surface;
-    uint32_t colors[4] = {
+    unsigned long colors[4] = {
 	0xffffffff, 0xffff0000,
 	0xff00ff00, 0xff0000ff
     };