diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2017-05-31 12:20:27 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2017-05-31 12:20:27 +0100 |
| commit | 148a5af3f66b504d3d36df3c6c45f218250a8a0a (patch) | |
| tree | 3615a98cf1e78ccd413b91949b00418ad0770b46 | |
| parent | 0b86506c7c19e3ef0c6581dfbc04aec769af57c3 (diff) | |
| download | pango-148a5af3f66b504d3d36df3c6c45f218250a8a0a.tar.gz | |
Ignore undefined macros when importing freetype / 2
Missing inclusions of freetype via Cairo.
| -rw-r--r-- | pango/pangocairo-fcfont.c | 4 | ||||
| -rw-r--r-- | pango/pangocairo-fcfontmap.c | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/pango/pangocairo-fcfont.c b/pango/pangocairo-fcfont.c index 95f82e15..30ecde4d 100644 --- a/pango/pangocairo-fcfont.c +++ b/pango/pangocairo-fcfont.c @@ -21,7 +21,11 @@ #include "config.h" +/* Freetype has undefined macros in its header */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wundef" #include <cairo-ft.h> +#pragma GCC diagnostic pop #include "pango-fontmap.h" #include "pangocairo-private.h" diff --git a/pango/pangocairo-fcfontmap.c b/pango/pangocairo-fcfontmap.c index f7b337d5..bce3665c 100644 --- a/pango/pangocairo-fcfontmap.c +++ b/pango/pangocairo-fcfontmap.c @@ -19,7 +19,12 @@ * Boston, MA 02111-1307, USA. */ #include "config.h" + +/* Freetype has undefined macros in its headers */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wundef" #include <cairo-ft.h> +#pragma GCC diagnostic pop #include "pangofc-fontmap.h" #include "pangocairo.h" |