pixman: Branch 'master' - 2 commits

[Jeff Muizelaar]

 pixman/Makefile.win32  |    1 +
 pixman/pixman-matrix.c |    3 +++
 2 files changed, 4 insertions(+)

New commits:
commit 072d848f592530973f1f0a0066a320ec5965625c
Author: Jeff Muizelaar <jmuizelaar at mozilla.com>
Date:   Fri Jan 9 12:48:22 2009 -0500

    Add pixman-matrix.c to Makefile.win32

diff --git a/pixman/Makefile.win32 b/pixman/Makefile.win32
index ad30f8c..208bb2e 100644
--- a/pixman/Makefile.win32
+++ b/pixman/Makefile.win32
@@ -49,6 +49,7 @@ SOURCES = \
 	pixman-trap.c					\
 	pixman-compute-region.c		\
 	pixman-timer.c					\
+	pixman-matrix.c					\
 	$(NULL)
 
 # MMX compilation flags
commit c55db2905706ae78364bfb63dcfa62c00cc486c7
Author: Jeff Muizelaar <jmuizelaar at mozilla.com>
Date:   Fri Jan 9 12:48:20 2009 -0500

    Conditionally include config.h in pixman-matrix.c to fix win32 build

diff --git a/pixman/pixman-matrix.c b/pixman/pixman-matrix.c
index fb1e49a..8e3a3c0 100644
--- a/pixman/pixman-matrix.c
+++ b/pixman/pixman-matrix.c
@@ -24,7 +24,10 @@
  * Matrix interfaces
  */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
 #include <math.h>
 #include <string.h>
 #include "pixman-private.h"