Skip to content

Commit ddcd1c8

Browse files
authored
Remove outdated code from mysqli Windows build (#14648)
The --with-mysqli option once accepted the mysqlnd argument when also libmysql was used.
1 parent 106581b commit ddcd1c8

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

ext/mysqli/config.w32

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
// vim:ft=javascript
22

33
// Note: The extension name is "mysqli", you enable it with "--with-mysqli".
4-
// Passing value "mysqlnd" to it enables the bundled
5-
// client library to connect to the MySQL server, i.e. no external MySQL
6-
// client library is needed to perform the build.
74

85
ARG_WITH("mysqli", "MySQLi support", "no");
96

@@ -19,10 +16,8 @@ if (PHP_MYSQLI != "no") {
1916
"mysqli_report.c " +
2017
"mysqli_warning.c";
2118

22-
if (PHP_MYSQLI != "no") {
23-
EXTENSION("mysqli", mysqli_source, PHP_MYSQLI_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
24-
ADD_EXTENSION_DEP('mysqli', 'mysqlnd');
25-
ADD_EXTENSION_DEP('mysqli', 'spl');
26-
PHP_INSTALL_HEADERS("ext/mysqli", "php_mysqli_structs.h mysqli_mysqlnd.h");
27-
}
19+
EXTENSION("mysqli", mysqli_source, PHP_MYSQLI_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
20+
ADD_EXTENSION_DEP('mysqli', 'mysqlnd');
21+
ADD_EXTENSION_DEP('mysqli', 'spl');
22+
PHP_INSTALL_HEADERS("ext/mysqli", "php_mysqli_structs.h mysqli_mysqlnd.h");
2823
}

0 commit comments

Comments
 (0)