com php-src: Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012: TSRM/tsrm_config.w32.h Z end/zend_config.w32.h

From: Date: Sat, 04 Jan 2014 00:41:01 +0000
Subject: com php-src: Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012: TSRM/tsrm_config.w32.h Z end/zend_config.w32.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-75540@lists.php.net to get a copy of this message
Commit: ae1cc83f98b779eb3f01779d416bde994332efd3 Author: Anatol Belski <ab@php.net> Sat, 4 Jan 2014 00:47:10 +0100 Parents: d992a972c0b188977cc4d4ad8d35929317f5ddd5 Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ae1cc83f98b779eb3f01779d416bde994332efd3 Log: 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. Bugs: https://bugs.php.net/66009 Changed paths: M TSRM/tsrm_config.w32.h M Zend/zend_config.w32.h Diff: diff --git a/TSRM/tsrm_config.w32.h b/TSRM/tsrm_config.w32.h index 14c6443..1443e7c 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 diff --git a/Zend/zend_config.w32.h b/Zend/zend_config.w32.h index f779a50..6ea6760 100644 --- a/Zend/zend_config.w32.h +++ b/Zend/zend_config.w32.h @@ -62,10 +62,15 @@ typedef unsigned int uint; /* This will cause the compilation process to be MUCH longer, but will generate * a much quicker PHP binary */ -#undef inline #ifdef ZEND_WIN32_FORCE_INLINE +/* _ALLOW_KEYWORD_MACROS is only relevant for C++ */ +# if (_MSC_VER >= 1700) && !defined(_ALLOW_KEYWORD_MACROS) +# define _ALLOW_KEYWORD_MACROS +# endif +# undef inline # define inline __forceinline -#else +#elif !defined(ZEND_WIN32_KEEP_INLINE) +# undef inline # define inline #endif

« previous php.cvs (#75540) next »