[pango] Ignore undefined macros when importing freetype / 2
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango] Ignore undefined macros when importing freetype / 2
- Date: Wed, 31 May 2017 11:21:16 +0000 (UTC)
commit 148a5af3f66b504d3d36df3c6c45f218250a8a0a
Author: Emmanuele Bassi <ebassi gnome org>
Date: Wed May 31 12:20:27 2017 +0100
Ignore undefined macros when importing freetype / 2
Missing inclusions of freetype via Cairo.
pango/pangocairo-fcfont.c | 4 ++++
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 95f82e1..30ecde4 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 f7b337d..bce3665 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"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]