From 2ced3eff149d2cca295894d77ded47e9318b0015 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sun, 23 Jun 2024 23:26:30 +0200 Subject: [PATCH] Remove outdated code from mysqli Windows build The --with-mysqli option once accepted the mysqlnd argument when also libmysql was used. --- ext/mysqli/config.w32 | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/ext/mysqli/config.w32 b/ext/mysqli/config.w32 index a44058ee5953..8a252cb2adec 100644 --- a/ext/mysqli/config.w32 +++ b/ext/mysqli/config.w32 @@ -1,9 +1,6 @@ // vim:ft=javascript // Note: The extension name is "mysqli", you enable it with "--with-mysqli". -// Passing value "mysqlnd" to it enables the bundled -// client library to connect to the MySQL server, i.e. no external MySQL -// client library is needed to perform the build. ARG_WITH("mysqli", "MySQLi support", "no"); @@ -19,10 +16,8 @@ if (PHP_MYSQLI != "no") { "mysqli_report.c " + "mysqli_warning.c"; - if (PHP_MYSQLI != "no") { - EXTENSION("mysqli", mysqli_source, PHP_MYSQLI_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); - ADD_EXTENSION_DEP('mysqli', 'mysqlnd'); - ADD_EXTENSION_DEP('mysqli', 'spl'); - PHP_INSTALL_HEADERS("ext/mysqli", "php_mysqli_structs.h mysqli_mysqlnd.h"); - } + EXTENSION("mysqli", mysqli_source, PHP_MYSQLI_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); + ADD_EXTENSION_DEP('mysqli', 'mysqlnd'); + ADD_EXTENSION_DEP('mysqli', 'spl'); + PHP_INSTALL_HEADERS("ext/mysqli", "php_mysqli_structs.h mysqli_mysqlnd.h"); }