Skip to content

Commit 09d0e38

Browse files
authored
Remove unsynced and unused HAVE_<extension> defines (#14233)
This syncs build system gaps of some extensions' definitions being defined on Windows and some on *nix. These are not used anywhere and are only defined in some build system and not the other: * HAVE_INTL (was present only on Windows) * HAVE_PDO_DBLIB (was present only on Autotools) * HAVE_PDO_FIREBIRD (was present only on Autotools) * HAVE_TOKENIZER (was present only on Windows)
1 parent dde5c65 commit 09d0e38

File tree

4 files changed

+0
-4
lines changed

4 files changed

+0
-4
lines changed

ext/intl/config.w32

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ if (PHP_INTL != "no") {
126126
}
127127

128128
ADD_FLAG("CFLAGS_INTL", "/EHsc /DUNISTR_FROM_CHAR_EXPLICIT=explicit /DUNISTR_FROM_STRING_EXPLICIT=explicit /DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1 /DU_HIDE_OBSOLETE_UTF_OLD_H=1");
129-
AC_DEFINE("HAVE_INTL", 1, "Internationalization support enabled");
130129
} else {
131130
WARNING("intl not enabled; libraries and/or headers not found");
132131
}

ext/pdo_dblib/config.m4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ if test "$PHP_PDO_DBLIB" != "no"; then
4545

4646
PDO_DBLIB_DEFS="-DPDO_DBLIB_FLAVOUR=\\\"freetds\\\""
4747
PHP_NEW_EXTENSION(pdo_dblib, pdo_dblib.c dblib_driver.c dblib_stmt.c, $ext_shared,,-I$pdo_cv_inc_path $PDO_DBLIB_DEFS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
48-
AC_DEFINE(HAVE_PDO_DBLIB,1,[ ])
4948
PHP_SUBST(PDO_DBLIB_SHARED_LIBADD)
5049

5150
PHP_ADD_EXTENSION_DEP(pdo_dblib, pdo)

ext/pdo_firebird/config.m4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then
6060

6161
PHP_CHECK_PDO_INCLUDES
6262

63-
AC_DEFINE(HAVE_PDO_FIREBIRD,1,[ ])
6463
PHP_NEW_EXTENSION(pdo_firebird, pdo_firebird.c firebird_driver.c firebird_statement.c, $ext_shared,,-I$pdo_cv_inc_path)
6564
PHP_SUBST(PDO_FIREBIRD_SHARED_LIBADD)
6665
PHP_ADD_EXTENSION_DEP(pdo_firebird, pdo)

ext/tokenizer/config.w32

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ ARG_ENABLE("tokenizer", "tokenizer support", "yes");
44

55
if (PHP_TOKENIZER == "yes") {
66
EXTENSION("tokenizer", "tokenizer.c tokenizer_data.c");
7-
AC_DEFINE("HAVE_TOKENIZER", 1, "Tokenizer support");
87
}

0 commit comments

Comments
 (0)