aboutsummaryrefslogtreecommitdiff
path: root/pixman/pixman/pixman.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-18 20:02:13 +0000
committermarha <marha@users.sourceforge.net>2010-05-18 20:02:13 +0000
commit39dd4fe6755ee1702107b613a8837196d8cab93e (patch)
tree27aafad46b7d6ce2bb62f8137d72794627c25618 /pixman/pixman/pixman.h
parenta457b80612b4f37be47099e9a0f38c4fc2a42252 (diff)
downloadvcxsrv-39dd4fe6755ee1702107b613a8837196d8cab93e.tar.gz
vcxsrv-39dd4fe6755ee1702107b613a8837196d8cab93e.tar.bz2
vcxsrv-39dd4fe6755ee1702107b613a8837196d8cab93e.zip
Update to pixman-0.18.2
Diffstat (limited to 'pixman/pixman/pixman.h')
-rw-r--r--pixman/pixman/pixman.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/pixman/pixman/pixman.h b/pixman/pixman/pixman.h
index 85fcc8c28..964d04ab9 100644
--- a/pixman/pixman/pixman.h
+++ b/pixman/pixman/pixman.h
@@ -89,7 +89,8 @@ PIXMAN_BEGIN_DECLS
#if defined (_SVR4) || defined (SVR4) || defined (__OpenBSD__) || defined (_sgi) || defined (__sun) || defined (sun) || defined (__digital__) || defined (__HP_cc)
# include <inttypes.h>
-#elif defined (_MSC_VER)
+/* VS 2010 (_MSC_VER 1600) has stdint.h */
+#elif defined (_MSC_VER) && _MSC_VER < 1600
typedef __int8 int8_t;
typedef unsigned __int8 uint8_t;
typedef __int16 int16_t;