pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman-filter.c |    2 ++
 pixman/pixman-vmx.c    |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit cb5d131ff4172a9bb455970cc15d93d8c1d14c4e
Author: ingmar at irsoft.de <ingmar at irsoft.de>
Date:   Sat May 11 11:55:04 2013 +0200

    Fix broken build when HAVE_CONFIG_H is undefined, e.g. on Win32.
    
    Build fix for platforms without a generated config.h, for example Win32.

diff --git a/pixman/pixman-filter.c b/pixman/pixman-filter.c
index 26b39d5..5ff7b6e 100644
--- a/pixman/pixman-filter.c
+++ b/pixman/pixman-filter.c
@@ -28,7 +28,9 @@
 #include <stdio.h>
 #include <math.h>
 #include <assert.h>
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 #include "pixman-private.h"
 
 typedef double (* kernel_func_t) (double x);
diff --git a/pixman/pixman-vmx.c b/pixman/pixman-vmx.c
index 6868704..f629003 100644
--- a/pixman/pixman-vmx.c
+++ b/pixman/pixman-vmx.c
@@ -25,7 +25,9 @@
  * Based on fbmmx.c by Owen Taylor, Søren Sandmann and Nicholas Miell
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 #include "pixman-private.h"
 #include "pixman-combine32.h"
 #include <altivec.h>