@@ -239,6 +239,9 @@ ADD_SOURCES("Zend", "zend_language_parser.c zend_language_scanner.c \
239239 zend_inheritance.c zend_smart_str.c zend_cpuinfo.c" ) ;
240240
241241ADD_FLAG ( "CFLAGS_BD_ZEND" , "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1" ) ;
242+ if ( VS_TOOLSET && VCVERS >= 1914 ) {
243+ ADD_FLAG ( "CFLAGS_BD_ZEND" , "/d2FuncCache1" ) ;
244+ }
242245
243246/* XXX inspect this for other toolsets */
244247//AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1);
@@ -249,19 +252,28 @@ ADD_SOURCES("main", "main.c snprintf.c spprintf.c getopt.c fopen_wrappers.c \
249252 php_open_temporary_file.c output.c internal_functions.c php_sprintf.c \
250253 php_syslog.c" ) ;
251254ADD_FLAG ( "CFLAGS_BD_MAIN" , "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1" ) ;
255+ if ( VS_TOOLSET && VCVERS >= 1914 ) {
256+ ADD_FLAG ( "CFLAGS_BD_MAIN" , "/d2FuncCache1" ) ;
257+ }
252258
253259AC_DEFINE ( 'HAVE_STRNLEN' , 1 ) ;
254260
255261ADD_SOURCES ( "main/streams" , "streams.c cast.c memory.c filter.c plain_wrapper.c \
256262 userspace.c transports.c xp_socket.c mmap.c glob_wrapper.c" ) ;
257263ADD_FLAG ( "CFLAGS_BD_MAIN_STREAMS" , "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1" ) ;
264+ if ( VS_TOOLSET && VCVERS >= 1914 ) {
265+ ADD_FLAG ( "CFLAGS_BD_MAIN_STREAMS" , "/d2FuncCache1" ) ;
266+ }
258267
259268ADD_SOURCES ( "win32" , "dllmain.c glob.c readdir.c \
260269 registry.c select.c sendmail.c time.c winutil.c wsyslog.c globals.c \
261270 getrusage.c ftok.c ioutil.c codepage.c nice.c \
262271 inet.c fnmatch.c sockets.c console.c" ) ;
263272
264273ADD_FLAG ( "CFLAGS_BD_WIN32" , "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1" ) ;
274+ if ( VS_TOOLSET && VCVERS >= 1914 ) {
275+ ADD_FLAG ( "CFLAGS_BD_WIN32" , "/d2FuncCache1" ) ;
276+ }
265277
266278PHP_INSTALL_HEADERS ( "" , "Zend/ TSRM/ main/ main/streams/ win32/" ) ;
267279
0 commit comments