gfx/cairo/cairo-version-fixes.patch
author Clint Talbert <ctalbert@mozilla.com>
Wed, 13 Jan 2010 14:44:49 -0800
changeset 37161 b5d9fbeec04ed773b9f8c23973fe0e16e301343b
parent 18829 6014c4fca4a141d791c1d012a269ad35e4f73218
permissions -rw-r--r--
Orange on Bd builds: Backed out changeset 745af1f3dbf5

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
@@ -42,7 +42,7 @@
 
 /* get the "real" version info instead of dummy cairo-version.h */
 #undef CAIRO_VERSION_H
-#include "../cairo-version.h"
+#include "cairo-features.h"
 
 /**
  * cairo_version:
diff --git a/gfx/cairo/cairo/src/cairo-version.h b/gfx/cairo/cairo/src/cairo-version.h
--- a/gfx/cairo/cairo/src/cairo-version.h
+++ b/gfx/cairo/cairo/src/cairo-version.h
@@ -7,8 +7,10 @@
 #ifndef CAIRO_VERSION_H
 #define CAIRO_VERSION_H
 
+#if 0
 #define CAIRO_VERSION_MAJOR USE_cairo_version_OR_cairo_version_string_INSTEAD
 #define CAIRO_VERSION_MINOR USE_cairo_version_OR_cairo_version_string_INSTEAD
 #define CAIRO_VERSION_MICRO USE_cairo_version_OR_cairo_version_string_INSTEAD
+#endif
 
 #endif