com php-src: rather use the supplied inttypes.h with vc14: win32/php_inttypes.h

From: Date: Fri, 23 Oct 2015 07:47:00 +0000
Subject: com php-src: rather use the supplied inttypes.h with vc14: win32/php_inttypes.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-89491@lists.php.net to get a copy of this message
Commit: 448d1ce428cd14453b908fdf721eb008d445474a Author: Anatol Belski <ab@php.net> Fri, 23 Oct 2015 09:47:00 +0200 Parents: 5ba763413b8f1e0e2399f124641845cf782ce0f5 Branches: PHP-7.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=448d1ce428cd14453b908fdf721eb008d445474a Log: rather use the supplied inttypes.h with vc14 Changed paths: M win32/php_inttypes.h Diff: diff --git a/win32/php_inttypes.h b/win32/php_inttypes.h index ead903f..4130649 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 +

« previous php.cvs (#89491) next »