aboutsummaryrefslogtreecommitdiff
path: root/pixman
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-06-21 08:11:16 +0200
committermarha <marha@users.sourceforge.net>2012-06-21 08:11:16 +0200
commit478ec8cab167e7d8be4973fc3f8d425b1baa4496 (patch)
tree0b05eb5a0e3a989a66baff04a954db416444f7c5 /pixman
parent62d040da7ea0a76d48014b5247d98b428ca50a15 (diff)
parentda6ea6d64418710cbf7e0639dfefd2d856d53f1a (diff)
downloadvcxsrv-478ec8cab167e7d8be4973fc3f8d425b1baa4496.tar.gz
vcxsrv-478ec8cab167e7d8be4973fc3f8d425b1baa4496.tar.bz2
vcxsrv-478ec8cab167e7d8be4973fc3f8d425b1baa4496.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'pixman')
-rw-r--r--pixman/pixman/pixman-glyph.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/pixman/pixman/pixman-glyph.c b/pixman/pixman/pixman-glyph.c
index 921eff158..cbc3637fa 100644
--- a/pixman/pixman/pixman-glyph.c
+++ b/pixman/pixman/pixman-glyph.c
@@ -23,10 +23,14 @@
*
* Author: Soren Sandmann <sandmann@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;