summaryrefslogtreecommitdiff
path: root/pango/pango-ot-info.c
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2011-09-16 15:54:42 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2011-09-17 00:40:28 +0800
commitc820da4fa40e02bf64d27b0467a530d990c93358 (patch)
treea7b33bb02450ad2f9c0c8dd8e5cde0ff9ca96d74 /pango/pango-ot-info.c
parent775dd4e33c14560fc10cc0ad323163ac3450f959 (diff)
downloadpango-c820da4fa40e02bf64d27b0467a530d990c93358.tar.gz
break.c: Fix compilation against newer GLib versions
G_UNICODE_COMBINING_MARK was renamed as G_UNICODE_SPACING_MARK soon after the GLib 2.29.14 release, so fix that in break.c and pango-ot-info.c. To support GLib on and before 2.29.14, a convenience definition for G_UNICODE_SPACING_MARK is defined.
Diffstat (limited to 'pango/pango-ot-info.c')
-rw-r--r--pango/pango-ot-info.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/pango/pango-ot-info.c b/pango/pango-ot-info.c
index 7bc249b0..e5d9c641 100644
--- a/pango/pango-ot-info.c
+++ b/pango/pango-ot-info.c
@@ -25,6 +25,10 @@
#include "pango-impl-utils.h"
#include FT_TRUETYPE_TABLES_H
+#if (!GLIB_CHECK_VERSION(2,29,15))
+#define G_UNICODE_SPACING_MARK G_UNICODE_COMBINING_MARK
+#endif
+
static void pango_ot_info_finalize (GObject *object);
static void synthesize_class_def (PangoOTInfo *info);
@@ -183,7 +187,7 @@ get_glyph_class (gunichar charcode,
switch ((int) g_unichar_type (charcode))
{
- case G_UNICODE_COMBINING_MARK:
+ case G_UNICODE_SPACING_MARK:
case G_UNICODE_ENCLOSING_MARK:
case G_UNICODE_NON_SPACING_MARK:
*class = HB_OT_LAYOUT_GLYPH_CLASS_MARK; /* Mark glyph (non-spacing combining glyph) */