[cairo-commit] cairo-demo/X11 ChangeLog, 1.11, 1.12 cairo-demo.c, 1.11, 1.12

[Oeyvind Kolaas]

Committed by: pippin

Update of /cvs/cairo/cairo-demo/X11
In directory gabe:/tmp/cvs-serv16382

Modified Files:
	ChangeLog cairo-demo.c 
Log Message:
add proper macros to use xcb instead of xlib when available

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo-demo/X11/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ChangeLog	7 Feb 2005 13:38:19 -0000	1.11
+++ ChangeLog	7 Feb 2005 13:41:33 -0000	1.12
@@ -2,6 +2,8 @@
 
 	* cairo-spline.c (win_init): initialize the stored mouse coordinates,
 	to silence valgrind.
+	* cairo-demo.c: add proper macros to use xcb instead of xlib when
+	available.
 
 2005-01-20  Carl Worth  <cworth at cworth.org>
 

Index: cairo-demo.c
===================================================================
RCS file: /cvs/cairo/cairo-demo/X11/cairo-demo.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- cairo-demo.c	7 Feb 2005 13:38:19 -0000	1.11
+++ cairo-demo.c	7 Feb 2005 13:41:34 -0000	1.12
@@ -3,13 +3,16 @@
 #include <math.h>
 
 #include <cairo.h>
-//#include <cairo-xcb.h>
-#include <cairo-xlib.h>
 
 #ifdef CAIRO_HAS_XCB_SURFACE
+#include <cairo-xcb.h>
 #undef CAIRO_HAS_XLIB_SURFACE
 #endif
 
+#ifdef CAIRO_HAS_XLIB_SURFACE
+#include <cairo-xlib.h>
+#endif
+
 #define PI 3.1415926535
 
 typedef struct win {