diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-18 20:22:49 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-18 20:22:49 +0000 |
| commit | 9760cb0938399b8f6080f6ca623d450eebbaad92 (patch) | |
| tree | 9e022997c484dbcf561598a70bd8fa31402df5c2 /pixman/pixman/pixman.h | |
| parent | d85e9f360392525f069cb89c0d3e97aab9d7d595 (diff) | |
| parent | 39dd4fe6755ee1702107b613a8837196d8cab93e (diff) | |
| download | vcxsrv-9760cb0938399b8f6080f6ca623d450eebbaad92.tar.gz vcxsrv-9760cb0938399b8f6080f6ca623d450eebbaad92.tar.bz2 vcxsrv-9760cb0938399b8f6080f6ca623d450eebbaad92.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'pixman/pixman/pixman.h')
| -rw-r--r-- | pixman/pixman/pixman.h | 3 |
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; |