[cairo-commit] cairo/src cairoint.h,1.196,1.197

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv14428/src

Modified Files:
	cairoint.h 
Log Message:

2005-08-16  Carl Worth  <cworth at cworth.org>

        * src/cairoint.h (CAIRO_PRINTF_FORMAT): Rename cairo_printf_format
        to CAIRO_PRINTF_FORMAT. Fix syntax error in the case of an empty
        definition. (Thanks to Vladimir Vukicevic).


Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- cairoint.h	14 Aug 2005 00:38:23 -0000	1.196
+++ cairoint.h	16 Aug 2005 23:41:10 -0000	1.197
@@ -87,10 +87,10 @@
 #endif
 
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-#define cairo_printf_format(fmt_index, va_index) \
+#define CAIRO_PRINTF_FORMAT(fmt_index, va_index) \
 	__attribute__((__format__(__printf__, fmt_index, va_index)))
 #else
-#define cairo_printf_format (fmt_index, va_index)
+#define CAIRO_PRINTF_FORMAT(fmt_index, va_index)
 #endif
 
 /* slim_internal.h */
@@ -1999,8 +1999,7 @@
 
 cairo_private cairo_status_t
 _cairo_output_stream_printf (cairo_output_stream_t *stream,
-			     const char *fmt, ...)
-    cairo_printf_format(2, 3);
+			     const char *fmt, ...) CAIRO_PRINTF_FORMAT(2, 3);
 
 cairo_private long
 _cairo_output_stream_get_position (cairo_output_stream_t *status);