Skip to content

Commit 1b969a7

Browse files
committed
Remove some unused HAVE_* symbols
- HAVE_NET_SNMP removed via cab643f - HAVE_CRYPTO_AEAD_AES256GCM ad120c5 - Remove HAVE_FREETDS and HAVE_LIBDNET_STUB (not used in current extension; copy paste from other removed extensions) Closes GH-4448
1 parent 15782b2 commit 1b969a7

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

ext/pdo_dblib/config.m4

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,10 @@ if test "$PHP_PDO_DBLIB" != "no"; then
5555

5656
PDO_DBLIB_DEFS="-DPDO_DBLIB_FLAVOUR=\\\"freetds\\\""
5757
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)
58-
AC_CHECK_LIB(dnet_stub, dnet_addr,
59-
[ PHP_ADD_LIBRARY_WITH_PATH(dnet_stub,,PDO_DBLIB_SHARED_LIBADD)
60-
AC_DEFINE(HAVE_LIBDNET_STUB,1,[ ])
61-
])
58+
AC_CHECK_LIB(dnet_stub, dnet_addr, [
59+
PHP_ADD_LIBRARY_WITH_PATH(dnet_stub,,PDO_DBLIB_SHARED_LIBADD)
60+
])
6261
AC_DEFINE(HAVE_PDO_DBLIB,1,[ ])
63-
AC_DEFINE(HAVE_FREETDS,1,[ ])
6462
PHP_SUBST(PDO_DBLIB_SHARED_LIBADD)
6563

6664
PHP_ADD_EXTENSION_DEP(pdo_dblib, pdo)

ext/snmp/config.w32

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ if (PHP_SNMP != "no") {
88
if (CHECK_LIB("netsnmp.lib", "snmp", PHP_SNMP)) {
99
EXTENSION('snmp', 'snmp.c');
1010
AC_DEFINE('HAVE_SNMP', 1);
11-
AC_DEFINE("HAVE_NET_SNMP", 1);
1211
} else {
1312
WARNING("snmp not enabled; libraries and headers not found");
1413
}

ext/sodium/config.w32

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ if (PHP_SODIUM != "no") {
66
if (CHECK_LIB("libsodium.lib", "sodium", PHP_SODIUM) && CHECK_HEADER_ADD_INCLUDE("sodium.h", "CFLAGS_SODIUM")) {
77
EXTENSION("sodium", "libsodium.c sodium_pwhash.c");
88
AC_DEFINE('HAVE_LIBSODIUMLIB', 1 , 'Have the Sodium library');
9-
AC_DEFINE("HAVE_CRYPTO_AEAD_AES256GCM", 1, "");
109
PHP_INSTALL_HEADERS("ext/sodium/", "php_libsodium.h");
1110
} else {
1211
WARNING("libsodium not enabled; libraries and headers not found");

0 commit comments

Comments
 (0)