mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-30 21:55:31 +00:00
850e9f7d39
b=453765; Upgrade cairo to 1.7.4-136-g5ea2555; r=me --HG-- rename : gfx/cairo/libpixman/src/pixman-sse.c => gfx/cairo/libpixman/src/pixman-sse2.c rename : gfx/cairo/libpixman/src/pixman-sse.h => gfx/cairo/libpixman/src/pixman-sse2.h
27 lines
871 B
Diff
27 lines
871 B
Diff
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
|