summaryrefslogtreecommitdiff
path: root/win32/php_inttypes.h
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-10-23 09:47:00 +0200
committerAnatol Belski <ab@php.net>2015-10-23 09:47:00 +0200
commit448d1ce428cd14453b908fdf721eb008d445474a (patch)
treec2958901b81f2806bbc9a69b985ca9c980deca47 /win32/php_inttypes.h
parent5ba763413b8f1e0e2399f124641845cf782ce0f5 (diff)
downloadphp-git-448d1ce428cd14453b908fdf721eb008d445474a.tar.gz
rather use the supplied inttypes.h with vc14
Diffstat (limited to 'win32/php_inttypes.h')
-rw-r--r--win32/php_inttypes.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/win32/php_inttypes.h b/win32/php_inttypes.h
index ead903f78e..4130649cf2 100644
--- a/win32/php_inttypes.h
+++ b/win32/php_inttypes.h
@@ -33,6 +33,10 @@
#error "Use this header only with Microsoft Visual C++ compilers!"
#endif // _MSC_VER ]
+// Starting with vc14, many of the C11 features are now included, so we only
+// need many of these typedefs and defines for older VS suites
+#if _MSC_VER < 1900
+
#ifndef _MSC_INTTYPES_H_ // [
#define _MSC_INTTYPES_H_
@@ -303,3 +307,8 @@ imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom)
#endif // _MSC_INTTYPES_H_ ]
+
+#else
+#include <inttypes.h>
+#endif
+