Define CAIRO_VERSION_H to avoid macro redefinition warning. draft
authorISHIKAWA, Chiaki <ishikawa@yk.rim.or.jp>
Sat, 09 Nov 2019 11:00:21 +0900
changeset 81076 f071e8855b79e28a0f0bf68e3e1993de517bfa41
parent 81075 09388c5f6d825eca9bc1e050a5420dd9f4cf487a
child 81077 112f0311755582258d5b934636bdf26ac3f27189
push id9744
push userishikawa@yk.rim.or.jp
push dateSat, 09 Nov 2019 02:01:06 +0000
treeherdertry-comm-central@56c83244ac0e [default view] [failures only]
Define CAIRO_VERSION_H to avoid macro redefinition warning.
mozilla-M-C-014-cairo-version-macro-value.patch
new file mode 100644
--- /dev/null
+++ b/mozilla-M-C-014-cairo-version-macro-value.patch
@@ -0,0 +1,27 @@
+# HG changeset patch
+# User ISHIKAWA, Chiaki <ishikawa@yk.rim.or.jp>
+# Parent  332585623cbeb35b066bad396d9cb0c7982596ef
+Define CAIRO_VERSION_H to avoid macro redefinition warning.
+
+diff --git a/gfx/cairo/cairo/src/cairo-version.c b/gfx/cairo/cairo/src/cairo-version.c
+--- a/gfx/cairo/cairo/src/cairo-version.c
++++ b/gfx/cairo/cairo/src/cairo-version.c
+@@ -31,17 +31,17 @@
+  *
+  * The Initial Developer of the Original Code is University of Southern
+  * California.
+  *
+  * Contributor(s):
+  *	Carl D. Worth <cworth@cworth.org>
+  */
+ 
+-#define CAIRO_VERSION_H 1
++#define CAIRO_VERSION_H
+ 
+ #include "cairoint.h"
+ 
+ /* get the "real" version info instead of dummy cairo-version.h */
+ #undef CAIRO_VERSION_H
+ #include "cairo-features.h"
+ 
+ /**