mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 20:05:49 +00:00
b=383960, moz cairo: fix up compilation with in-tree pixman
This commit is contained in:
parent
fbf39d6342
commit
303fc3aa14
@ -81,6 +81,7 @@ CSRCS = \
|
|||||||
cairo-debug.c \
|
cairo-debug.c \
|
||||||
cairo-deflate-stream.c \
|
cairo-deflate-stream.c \
|
||||||
cairo-fixed.c \
|
cairo-fixed.c \
|
||||||
|
cairo-font-face.c \
|
||||||
cairo-font-options.c \
|
cairo-font-options.c \
|
||||||
cairo-freelist.c \
|
cairo-freelist.c \
|
||||||
cairo-gstate.c \
|
cairo-gstate.c \
|
||||||
@ -197,3 +198,7 @@ DEFINES += -DPACKAGE_VERSION="\"moz\"" -DPACKAGE_BUGREPORT="\"http://bugzilla.mo
|
|||||||
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
|
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
|
||||||
DEFINES += -DCAIRO_WIN32_STATIC_BUILD
|
DEFINES += -DCAIRO_WIN32_STATIC_BUILD
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifdef MOZ_TREE_CAIRO
|
||||||
|
DEFINES += -DMOZ_TREE_CAIRO
|
||||||
|
endif
|
||||||
|
@ -64,7 +64,11 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#include "cairo.h"
|
#include "cairo.h"
|
||||||
|
#ifdef MOZ_TREE_CAIRO
|
||||||
|
#include "pixman.h"
|
||||||
|
#else
|
||||||
#include <pixman/pixman.h>
|
#include <pixman/pixman.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#define snprintf _snprintf
|
#define snprintf _snprintf
|
||||||
|
Loading…
Reference in New Issue
Block a user