apparently quartz and xlib don't like eachother

diff --git a/plugin/pango/gvrender_pango.c b/plugin/pango/gvrender_pango.c
index 4019477d6e513c8a7f387bd31e974804ab9d9304..e04227dc39987966f19c93c221e98e6c467f1fb4 100644 (file)
--- a/plugin/pango/gvrender_pango.c
+++ b/plugin/pango/gvrender_pango.c
@@ -88,14 +88,17 @@ static int dotted_len = ARRAY_SIZE(dotted);
 #include <cairo-svg.h>
 #endif
 
-#ifdef CAIRO_HAS_XLIB_SURFACE
-#include <cairo-xlib.h>
-#endif
+/* FIXME - symbol "Cursor" conflicts with X */
+#undef CAIRO_HAS_QUARTZ_SURFACE
 
 #ifdef CAIRO_HAS_QUARTZ_SURFACE
 #include <cairo-quartz.h>
 #endif
 
+#ifdef CAIRO_HAS_XLIB_SURFACE
+#include <cairo-xlib.h>
+#endif
+
 #ifdef CAIRO_HAS_GLITZ
 #include <cairo-glitz.h>
 #endif