diff options
| author | Anatol Belski <ab@php.net> | 2014-01-04 00:47:10 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-01-04 01:41:01 +0100 |
| commit | ae1cc83f98b779eb3f01779d416bde994332efd3 (patch) | |
| tree | 29df207868aa8971503cdf479891f2cf26ed3195 /TSRM | |
| parent | d992a972c0b188977cc4d4ad8d35929317f5ddd5 (diff) | |
| download | php-git-ae1cc83f98b779eb3f01779d416bde994332efd3.tar.gz | |
Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
Visual Studio 2012 includes sanity checks for C++11 features, see
http://msdn.microsoft.com/en-us/library/vstudio/bb531344(v=vs.110).aspx
To fix the 'inline' keyword redefinition for C++ in debug mode, the
new macros ZEND_WIN32_KEEP_INLINE is introduced, ZEND_WIN32_FORCE_INLINE is
automatically appended in release mode.
Diffstat (limited to 'TSRM')
| -rw-r--r-- | TSRM/tsrm_config.w32.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/TSRM/tsrm_config.w32.h b/TSRM/tsrm_config.w32.h index 14c6443a03..1443e7cca9 100644 --- a/TSRM/tsrm_config.w32.h +++ b/TSRM/tsrm_config.w32.h @@ -2,6 +2,7 @@ #define TSRM_CONFIG_W32_H #include <../main/config.w32.h> +#include "Zend/zend_config.w32.h" #define HAVE_UTIME 1 #define HAVE_ALLOCA 1 @@ -11,12 +12,4 @@ #include <stdlib.h> #include <crtdbg.h> -#undef inline -#ifdef ZEND_WIN32_FORCE_INLINE -# define inline __forceinline -#else -# define inline -#endif - - #endif |