Skip to content

Commit 3df665a

Browse files
authored
[Windows build] Remove redundant flags definitions (#18890)
The /d2FuncCache1 compile option is already added by toolset_setup_common_cflags() in confutils.js to all targets. ZEND_DVAL_TO_LVAL_CAST_OK was removed in 3725717.
1 parent b727821 commit 3df665a

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

win32/build/config.w32

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -285,12 +285,6 @@ if (TARGET_ARCH == 'x64') {
285285
}
286286

287287
ADD_FLAG("CFLAGS_BD_ZEND", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
288-
if (VS_TOOLSET && VCVERS >= 1914) {
289-
ADD_FLAG("CFLAGS_BD_ZEND", "/d2FuncCache1");
290-
}
291-
292-
/* XXX inspect this for other toolsets */
293-
//AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1);
294288

295289
ADD_SOURCES("main", "main.c snprintf.c spprintf.c getopt.c fopen_wrappers.c \
296290
php_ini_builder.c php_glob.c \
@@ -299,9 +293,6 @@ ADD_SOURCES("main", "main.c snprintf.c spprintf.c getopt.c fopen_wrappers.c \
299293
php_open_temporary_file.c output.c internal_functions.c \
300294
php_syslog.c php_odbc_utils.c safe_bcmp.c");
301295
ADD_FLAG("CFLAGS_BD_MAIN", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
302-
if (VS_TOOLSET && VCVERS >= 1914) {
303-
ADD_FLAG("CFLAGS_BD_MAIN", "/d2FuncCache1");
304-
}
305296

306297
AC_DEFINE('HAVE_STRNLEN', 1);
307298

@@ -310,19 +301,13 @@ AC_DEFINE('ZEND_CHECK_STACK_LIMIT', 1)
310301
ADD_SOURCES("main/streams", "streams.c cast.c memory.c filter.c plain_wrapper.c \
311302
userspace.c transports.c xp_socket.c mmap.c glob_wrapper.c");
312303
ADD_FLAG("CFLAGS_BD_MAIN_STREAMS", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
313-
if (VS_TOOLSET && VCVERS >= 1914) {
314-
ADD_FLAG("CFLAGS_BD_MAIN_STREAMS", "/d2FuncCache1");
315-
}
316304

317305
ADD_SOURCES("win32", "dllmain.c readdir.c \
318306
registry.c select.c sendmail.c time.c winutil.c wsyslog.c globals.c \
319307
getrusage.c ftok.c ioutil.c codepage.c nice.c \
320308
fnmatch.c sockets.c console.c signal.c");
321309

322310
ADD_FLAG("CFLAGS_BD_WIN32", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
323-
if (VS_TOOLSET && VCVERS >= 1914) {
324-
ADD_FLAG("CFLAGS_BD_WIN32", "/d2FuncCache1");
325-
}
326311

327312
PHP_INSTALL_HEADERS("", "Zend/ TSRM/ main/ main/streams/ win32/");
328313
PHP_INSTALL_HEADERS("Zend/Optimizer", "zend_call_graph.h zend_cfg.h zend_dfg.h zend_dump.h zend_func_info.h zend_inference.h zend_optimizer.h zend_ssa.h zend_worklist.h");

0 commit comments

Comments
 (0)