pixman: Branch 'master'

[Andrea Canciani]

 pixman/pixman-glyph.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 4cbeb0aedccde5d2eb87daec08040a8bf161f6d7
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Wed Jun 20 17:13:33 2012 +0200

    build: Fix compilation on win32
    
    When compiling using the win32 build system, config.h is not
    available nor needed.
    
    Fixes:
    
    pixman-glyph.c(26) : fatal error C1083: Cannot open include file:
    'config.h': No such file or directory

diff --git a/pixman/pixman-glyph.c b/pixman/pixman-glyph.c
index 921eff1..cbc3637 100644
--- a/pixman/pixman-glyph.c
+++ b/pixman/pixman-glyph.c
@@ -23,10 +23,14 @@
  *
  * Author: Soren Sandmann <sandmann at cs.au.dk>
  */
+
+#ifdef HAVE_CONFIG_H
 #include <config.h>
-#include <stdlib.h>
+#endif
 #include "pixman-private.h"
 
+#include <stdlib.h>
+
 typedef struct glyph_metrics_t glyph_metrics_t;
 typedef struct glyph_t glyph_t;