summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2008-04-08 21:06:20 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2008-04-08 21:06:20 +0000
commit886dab68d9abaa9d33af1c740d5a992023315724 (patch)
treea6813c28331592f6ae801994e7c0cba37238d5b0 /pango
parentfb4cb1b32ae77a27160e6719309dc2e39af8d60b (diff)
downloadpango-886dab68d9abaa9d33af1c740d5a992023315724.tar.gz
Try making our OS X stuff compile with latest cairo 1.5.x snapshots that
2008-04-08 Behdad Esfahbod <behdad@gnome.org> * configure.in: * pango/pangocairo-atsui.h: * pango/pangocairo-atsuifont.c: Try making our OS X stuff compile with latest cairo 1.5.x snapshots that renamed cairo-atsui to cairo-quartz-font. svn path=/trunk/; revision=2586
Diffstat (limited to 'pango')
-rw-r--r--pango/pangocairo-atsui.h4
-rw-r--r--pango/pangocairo-atsuifont.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/pango/pangocairo-atsui.h b/pango/pangocairo-atsui.h
index 6b97ce88..5b95425c 100644
--- a/pango/pangocairo-atsui.h
+++ b/pango/pangocairo-atsui.h
@@ -24,7 +24,11 @@
#include "pangoatsui-private.h"
#include <pango/pangocairo.h>
+#ifdef CAIRO_HAS_QUARTZ_FONT
+#include <cairo-quartz-font.h>
+#else
#include <cairo-atsui.h>
+#endif
G_BEGIN_DECLS
diff --git a/pango/pangocairo-atsuifont.c b/pango/pangocairo-atsuifont.c
index 23282023..ebc2446f 100644
--- a/pango/pangocairo-atsuifont.c
+++ b/pango/pangocairo-atsuifont.c
@@ -78,6 +78,10 @@ pango_cairo_atsui_font_get_glyph_extents (PangoFont *font,
logical_rect);
}
+/* XXX remove when we require cairo 1.6 */
+cairo_public cairo_font_face_t *
+cairo_atsui_face_create_for_atsu_font_id (ATSUFontID font_id);
+
static cairo_font_face_t *
pango_cairo_atsui_font_create_font_face (PangoCairoFont *font)
{