Backed out 4 changesets (bug 1879154) for causing bustage on nsUserCharacteristics...
[gecko.git] / gfx / cairo / pixman-rename.patch
blob03ee56f1526d1e073a19ff85c677c0938b9b645f
1 diff --git a/gfx/cairo/libpixman/src/pixman.h b/gfx/cairo/libpixman/src/pixman.h
2 --- a/gfx/cairo/libpixman/src/pixman.h
3 +++ b/gfx/cairo/libpixman/src/pixman.h
4 @@ -64,16 +64,20 @@ SOFTWARE.
5 * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
6 * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
7 * PERFORMANCE OF THIS SOFTWARE.
8 */
10 #ifndef PIXMAN_H__
11 #define PIXMAN_H__
13 +#ifdef MOZILLA_VERSION
14 +#include "cairo/pixman-rename.h"
15 +#endif
17 #include <pixman-version.h>
19 #ifdef __cplusplus
20 #define PIXMAN_BEGIN_DECLS extern "C" {
21 #define PIXMAN_END_DECLS }
22 #else
23 #define PIXMAN_BEGIN_DECLS
24 #define PIXMAN_END_DECLS