[cairo-commit] 2 commits - src/cairo-compiler-private.h test/pdiff

[Chris Wilson]

 src/cairo-compiler-private.h |    1 +
 test/pdiff/Makefile.am       |    2 +-
 test/pdiff/pdiff.h           |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 84a7a9955c8af99bc2224ee630473bbee137598e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Sep 10 18:23:31 2008 +0100

    [test] Typo in Makefile.am
    
    s/AC_CPPFLAGS/AM_CPPFLAGS/g

diff --git a/test/pdiff/Makefile.am b/test/pdiff/Makefile.am
index b900463..cc79328 100644
--- a/test/pdiff/Makefile.am
+++ b/test/pdiff/Makefile.am
@@ -13,7 +13,7 @@ perceptualdiff_SOURCES =	\
 	args.h			\
 	perceptualdiff.c
 
-AC_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(CAIRO_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(CAIRO_CFLAGS)
 LDADD = libpdiff.la $(top_builddir)/src/libcairo.la
 #
 # Delete intermediate files as well
diff --git a/test/pdiff/pdiff.h b/test/pdiff/pdiff.h
index b398cc6..4a80140 100644
--- a/test/pdiff/pdiff.h
+++ b/test/pdiff/pdiff.h
@@ -17,7 +17,7 @@
 #ifndef _PDIFF_H
 #define _PDIFF_H
 
-#include <cairo.h>
+#include "cairo.h"
 
 typedef int bool;
 #ifndef true
commit bf62798b1284533e28b78717dac8070ca6d29e54
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Sep 10 18:21:50 2008 +0100

    [cairo-compiler-private.h] Divert popen to _popen for MSVC
    
    Microsoft uses _popen instead of popen - required to build the
    boilerplate but not actually used on Windows (by default)!

diff --git a/src/cairo-compiler-private.h b/src/cairo-compiler-private.h
index 295b587..9a53234 100644
--- a/src/cairo-compiler-private.h
+++ b/src/cairo-compiler-private.h
@@ -116,6 +116,7 @@
 
 #if (defined(__WIN32__) && !defined(__WINE__)) || defined(_MSC_VER)
 #define snprintf _snprintf
+#define popen _popen
 #endif
 
 #ifdef _MSC_VER