From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Fri, 16 Sep 2011 08:00:51 +0000 (+0800)
Subject: hb-private.h: Fix compilation on newer GLib versions
X-Git-Tag: 1.29.5~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=775dd4e33c14560fc10cc0ad323163ac3450f959;p=platform%2Fupstream%2Fpango.git

hb-private.h: Fix compilation on newer GLib versions

g_atomic_int_exchange_and_add was deprecated in the GLib gatomic.c rewrite,
for GLib 2.29.6, so use g_atomic_int_add for GLib versions 2.29.5+.
---

diff --git a/pango/opentype/hb-private.h b/pango/opentype/hb-private.h
index 92e514f..2791b05 100644
--- a/pango/opentype/hb-private.h
+++ b/pango/opentype/hb-private.h
@@ -62,7 +62,11 @@
 #define hb_be_int32(v)		GINT32_FROM_BE (v)
 
 typedef int hb_atomic_int_t;
+#if !GLIB_CHECK_VERSION(2,29,5)
 #define hb_atomic_int_fetch_and_add(AI, V)	g_atomic_int_exchange_and_add (&(AI), V)
+#else
+#define hb_atomic_int_fetch_and_add(AI, V)	g_atomic_int_add (&(AI), V)
+#endif
 #define hb_atomic_int_get(AI)			g_atomic_int_get (&(AI))
 #define hb_atomic_int_set(AI, V)		g_atomic_int_set (&(AI), V)