b=383960, moz cairo: fix up compilation with in-tree pixman

This commit is contained in:
vladimir@pobox.com 2007-08-02 00:01:57 -07:00
parent fbf39d6342
commit 303fc3aa14
2 changed files with 9 additions and 0 deletions

View File

@ -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

View File

@ -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