From: ellson <devnull@localhost>
Date: Tue, 29 Aug 2006 20:57:44 +0000 (+0000)
Subject: apparently quartz and xlib don't like eachother
X-Git-Tag: LAST_LIBGRAPH~32^2~5924
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2435da0530fcf750e29d8a6783ebdab742d048fc;p=graphviz

apparently quartz and xlib don't like eachother
---

diff --git a/plugin/pango/gvrender_pango.c b/plugin/pango/gvrender_pango.c
index 4019477d6..e04227dc3 100644
--- 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