]> granicus.if.org Git - php/commitdiff
rather use the supplied inttypes.h with vc14
authorAnatol Belski <ab@php.net>
Fri, 23 Oct 2015 07:47:00 +0000 (09:47 +0200)
committerAnatol Belski <ab@php.net>
Fri, 23 Oct 2015 07:47:00 +0000 (09:47 +0200)
win32/php_inttypes.h

index ead903f78e40494f3ed29a4b3a7bc0e32946658e..4130649cf26ae975555d1fc423359bc218c21da2 100644 (file)
 #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
+