From a29df0f3b34b5723d9a7032d7a88f61fccac46f0 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 9 Apr 2008 17:13:00 +0000 Subject: [PATCH] Really fix build without cairo-atsui. 2008-04-09 Behdad Esfahbod * pango/pangocairo-atsui.h: * pango/pangocairo-atsuifont.c: Really fix build without cairo-atsui. svn path=/trunk/; revision=2591 --- ChangeLog | 6 ++++++ pango/pangocairo-atsui.h | 2 +- pango/pangocairo-atsuifont.c | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 37ab1d1..f9f5a16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-04-09 Behdad Esfahbod + + * pango/pangocairo-atsui.h: + * pango/pangocairo-atsuifont.c: + Really fix build without cairo-atsui. + 2008-04-08 Behdad Esfahbod * === Released 1.20.1 === diff --git a/pango/pangocairo-atsui.h b/pango/pangocairo-atsui.h index 5b95425..4d38806 100644 --- a/pango/pangocairo-atsui.h +++ b/pango/pangocairo-atsui.h @@ -25,7 +25,7 @@ #include "pangoatsui-private.h" #include #ifdef CAIRO_HAS_QUARTZ_FONT -#include +#include #else #include #endif diff --git a/pango/pangocairo-atsuifont.c b/pango/pangocairo-atsuifont.c index ebc2446..e631b18 100644 --- 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); -- 2.7.4