diff options
Diffstat (limited to 'pango')
-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 ()) |