[cairo-commit] cairo/test cairo-test.c,1.28,1.29

[Carl Worth]

Committed by: cworth

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

Modified Files:
	cairo-test.c 
Log Message:

        * configure.in:

        * src/cairo-features.h.in: Change definitions of everything in
        cairo-features.h to prefer #if over #ifdef.

        * src/cairo-atsui.h:
        * src/cairo-cache.c:
        * src/cairo-ft-private.h:
        * src/cairo-ft.h:
        * src/cairo-glitz.h:
        * src/cairo-pdf.h:
        * src/cairo-ps.h:
        * src/cairo-quartz.h:
        * src/cairo-win32.h:
        * src/cairo-xcb.h:
        * src/cairo-xlib.h:
        * src/cairo.c:
        * src/cairo.h:
        * src/cairoint.h:
        * test/cairo-test.c: Track #ifdef -> #if changes.

        * util/cairo-api-update: Add support to automatically change all
        #ifdef CAIRO_HAS to #if CAIRO_HAS.


Index: cairo-test.c
===================================================================
RCS file: /cvs/cairo/cairo/test/cairo-test.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- cairo-test.c	6 May 2005 20:32:53 -0000	1.28
+++ cairo-test.c	7 May 2005 04:33:22 -0000	1.29
@@ -146,7 +146,7 @@
 }
 #endif
 
-#ifdef CAIRO_HAS_QUARTZ_SURFACE
+#if CAIRO_HAS_QUARTZ_SURFACE
 static cairo_surface_t *
 create_quartz_surface (int width, int height, void **closure)
 {
@@ -160,7 +160,7 @@
 }
 #endif
 
-#ifdef CAIRO_HAS_WIN32_SURFACE
+#if CAIRO_HAS_WIN32_SURFACE
 static cairo_surface_t *
 create_win32_surface (int width, int height, void **closure)
 {
@@ -174,7 +174,7 @@
 }
 #endif
 
-#ifdef CAIRO_HAS_XCB_SURFACE
+#if CAIRO_HAS_XCB_SURFACE
 static cairo_surface_t *
 create_xcb_surface (int width, int height, void **closure)
 {
@@ -188,7 +188,7 @@
 }
 #endif
 
-#ifdef CAIRO_HAS_XLIB_SURFACE
+#if CAIRO_HAS_XLIB_SURFACE
 typedef struct _xlib_target_closure
 {
     Display *dpy;
@@ -332,16 +332,16 @@
 #if 0 /* #ifdef CAIRO_HAS_GLITZ_SURFACE */
 	    { "glitz", create_glitz_surface, cleanup_glitz}, 
 #endif
-#ifdef CAIRO_HAS_QUARTZ_SURFACE
+#if CAIRO_HAS_QUARTZ_SURFACE
 	    { "quartz", create_quartz_surface, cleanup_quartz},
 #endif
-#ifdef CAIRO_HAS_WIN32_SURFACE
+#if CAIRO_HAS_WIN32_SURFACE
 	    { "win32", create_win32_surface, cleanup_win32},
 #endif
-#ifdef CAIRO_HAS_XCB_SURFACE
+#if CAIRO_HAS_XCB_SURFACE
 	    { "xcb", create_xcb_surface, cleanup_xcb},
 #endif
-#ifdef CAIRO_HAS_XLIB_SURFACE
+#if CAIRO_HAS_XLIB_SURFACE
 	    { "xlib", create_xlib_surface, cleanup_xlib},
 #endif
 	};