diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2008-04-09 17:13:00 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2008-04-09 17:13:00 +0000 |
| commit | a29df0f3b34b5723d9a7032d7a88f61fccac46f0 (patch) | |
| tree | ccfc11ce233051fddafd2828a85dbf39b945c504 | |
| parent | 486f2412e8e7cf047b7b186d21cfcd4758832059 (diff) | |
| download | pango-a29df0f3b34b5723d9a7032d7a88f61fccac46f0.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | pango/pangocairo-atsui.h | 2 | ||||
| -rw-r--r-- | pango/pangocairo-atsuifont.c | 1 |
3 files changed, 8 insertions, 1 deletions
@@ -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 5b95425c..4d388065 100644 --- 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 ebc2446f..e631b18b 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); |