diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2017-05-31 11:54:43 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2017-05-31 12:07:38 +0100 |
| commit | 0b86506c7c19e3ef0c6581dfbc04aec769af57c3 (patch) | |
| tree | e3a4009c4b5fceedc55ed45b5e33578661272285 | |
| parent | c6d6cfff40ba2e80c2fda7d33d2942a0b4a2d14a (diff) | |
| download | pango-0b86506c7c19e3ef0c6581dfbc04aec769af57c3.tar.gz | |
Ignore undefined macros when importing freetype
Recently, freetype added checks for various options and forgot to check
all combinations. This breaks building projects including freetype.h
and using -Werror=undef.
| -rw-r--r-- | pango/Makefile.am | 1 | ||||
| -rw-r--r-- | pango/meson.build | 1 | ||||
| -rw-r--r-- | pango/pangofc-font.h | 11 |
3 files changed, 13 insertions, 0 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am index 6df7d52c..95b4dd2a 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -15,6 +15,7 @@ SUBDIRS = mini-fribidi INCLUDES = \ -DG_LOG_DOMAIN=\"Pango\" \ + -DPANGO_COMPILATION \ -DPANGO_ENABLE_BACKEND \ -DPANGO_ENABLE_ENGINE \ -DSYSCONFDIR=\"$(sysconfdir)\" \ diff --git a/pango/meson.build b/pango/meson.build index 93f2e79d..c3c1ad6a 100644 --- a/pango/meson.build +++ b/pango/meson.build @@ -82,6 +82,7 @@ pango_enum_h = pango_enums[1] pango_cflags = [ '-DG_LOG_DOMAIN="Pango"', '-DG_LOG_USE_STRUCTURED=1', + '-DPANGO_COMPILATION', '-DPANGO_ENABLE_BACKEND', '-DPANGO_ENABLE_ENGINE', '-DSYSCONFDIR="@0@"'.format(pango_sysconfdir), diff --git a/pango/pangofc-font.h b/pango/pangofc-font.h index ab5a12ac..954abdcb 100644 --- a/pango/pangofc-font.h +++ b/pango/pangofc-font.h @@ -23,10 +23,21 @@ #define __PANGO_FC_FONT_H__ #include <pango/pango.h> + +/* Freetype has undefined macros in its header */ +#ifdef PANGO_COMPILATION +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wundef" +#endif + #include <ft2build.h> #include FT_FREETYPE_H #include <fontconfig/fontconfig.h> +#ifdef PANGO_COMPILATION +#pragma GCC diagnostic pop +#endif + G_BEGIN_DECLS #define PANGO_TYPE_FC_FONT (pango_fc_font_get_type ()) |