summaryrefslogtreecommitdiff
path: root/win32/php_stdint.h
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-08-16 11:16:11 +0200
committerAnatol Belski <ab@php.net>2014-08-16 11:16:11 +0200
commit8ee2a4a9b5de682c0b37670e1f4f86242b1650ce (patch)
tree7768898294c125f79de082a986e962aa6cb23094 /win32/php_stdint.h
parent735ec33b828bc4429c4ec8de7ba547925a4b44e3 (diff)
downloadphp-git-8ee2a4a9b5de682c0b37670e1f4f86242b1650ce.tar.gz
first shot on merging the core fro the int64 branch
Diffstat (limited to 'win32/php_stdint.h')
-rw-r--r--win32/php_stdint.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/win32/php_stdint.h b/win32/php_stdint.h
index 0d63615c6b..4e9b869483 100644
--- a/win32/php_stdint.h
+++ b/win32/php_stdint.h
@@ -130,6 +130,7 @@ typedef uint64_t uintmax_t;
#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [ See footnote 220 at page 257 and footnote 221 at page 259
// 7.18.2.1 Limits of exact-width integer types
+#if _MSC_VER >= 1700 && !defined(_INTSAFE_H_INCLUDED_)
#define INT8_MIN ((int8_t)_I8_MIN)
#define INT8_MAX _I8_MAX
#define INT16_MIN ((int16_t)_I16_MIN)
@@ -142,6 +143,7 @@ typedef uint64_t uintmax_t;
#define UINT16_MAX _UI16_MAX
#define UINT32_MAX _UI32_MAX
#define UINT64_MAX _UI64_MAX
+#endif
// 7.18.2.2 Limits of minimum-width integer types
#define INT_LEAST8_MIN INT8_MIN