Really fix build without cairo-atsui.

2008-04-09  Behdad Esfahbod  <behdad@gnome.org>

        * pango/pangocairo-atsui.h:
        * pango/pangocairo-atsuifont.c:
        Really fix build without cairo-atsui.

svn path=/trunk/; revision=2591

diff --git a/ChangeLog b/ChangeLog
index 37ab1d1..f9f5a16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-09  Behdad Esfahbod  <behdad@gnome.org>
+
+       * pango/pangocairo-atsui.h:
+       * pango/pangocairo-atsuifont.c:
+       Really fix build without cairo-atsui.
+
 2008-04-08  Behdad Esfahbod  <behdad@gnome.org>
 
        * === Released 1.20.1 ===

diff --git a/pango/pangocairo-atsui.h b/pango/pangocairo-atsui.h
index 5b95425..4d38806 100644 (file)
--- a/pango/pangocairo-atsui.h
+++ b/pango/pangocairo-atsui.h
@@ -25,7 +25,7 @@
 #include "pangoatsui-private.h"
 #include <pango/pangocairo.h>
 #ifdef CAIRO_HAS_QUARTZ_FONT
-#include <cairo-quartz-font.h>
+#include <cairo-quartz.h>
 #else
 #include <cairo-atsui.h>
 #endif

diff --git a/pango/pangocairo-atsuifont.c b/pango/pangocairo-atsuifont.c
index ebc2446..e631b18 100644 (file)
--- a/pango/pangocairo-atsuifont.c
+++ b/pango/pangocairo-atsuifont.c
@@ -79,6 +79,7 @@ pango_cairo_atsui_font_get_glyph_extents (PangoFont      *font,
 }
 
 /* XXX remove when we require cairo 1.6 */
+#undef cairo_atsui_font_face_create_for_atsu_font_id
 cairo_public cairo_font_face_t *
 cairo_atsui_face_create_for_atsu_font_id (ATSUFontID font_id);