pixman: Branch 'master'

[Jeff Muizelaar]

 pixman/pixman.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit bc11545a1b5c22fe74fc954e26e8a8e9d7cfa39e
Author: Siddharth Agarwal <sid.bugzilla at gmail.com>
Date:   Tue Apr 13 10:15:29 2010 -0400

    Visual Studio 2010 includes stdint.h
    
    Use the builtin version instead of defining the types ourselves.

diff --git a/pixman/pixman.h b/pixman/pixman.h
index 85fcc8c..964d04a 100644
--- a/pixman/pixman.h
+++ b/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;