summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Withnall <withnall@endlessm.com>2017-08-12 10:25:26 +0100
committerPhilip Withnall <withnall@endlessm.com>2017-08-14 22:13:16 +0100
commit599ffcf042bbca6f87edff0e241958523145294d (patch)
tree8d12faa7a3e9d9a79b7285182ff7cb2e3d76bf87
parent5a0cc9f7f2e8e2e971e973caeeeb5aec59d68f59 (diff)
downloadpango-599ffcf042bbca6f87edff0e241958523145294d.tar.gz
mini-fribidi: Squash -Werror=undef failures due to use of #if
The FriBiDi code uses #if rather than #ifdef, which pedantic compilers warn about if the macro is undefined. The new Meson build sets -Werror=undef, promoting these warnings to failures, and making CI systems using certain compiler versions (in this case, Debian Jessie) sad. Signed-off-by: Philip Withnall <withnall@endlessm.com> https://bugzilla.gnome.org/show_bug.cgi?id=786192
-rw-r--r--pango/mini-fribidi/fribidi_config.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/pango/mini-fribidi/fribidi_config.h b/pango/mini-fribidi/fribidi_config.h
index 82e4da17..da0610df 100644
--- a/pango/mini-fribidi/fribidi_config.h
+++ b/pango/mini-fribidi/fribidi_config.h
@@ -5,6 +5,15 @@
#define HAS_FRIBIDI_TAB_CHAR_TYPE_2_I 1
#define FRIBIDI_API
+/* squash -Werror=undef warnings from the other char types */
+#define HAS_FRIBIDI_TAB_CHAR_TYPE_9_I 0
+#define HAS_FRIBIDI_TAB_CHAR_TYPE_8_I 0
+#define HAS_FRIBIDI_TAB_CHAR_TYPE_7_I 0
+#define HAS_FRIBIDI_TAB_CHAR_TYPE_6_I 0
+#define HAS_FRIBIDI_TAB_CHAR_TYPE_5_I 0
+#define HAS_FRIBIDI_TAB_CHAR_TYPE_4_I 0
+#define HAS_FRIBIDI_TAB_CHAR_TYPE_3_I 0
+
/* this was in fribidi_unicode.h. we only need these bits from that
* file, so moved here. */
#define UNI_MAX_BIDI_LEVEL 61