Skip to content

Commit 94421e5

Browse files
committed
Remove conditional calls of always available macros
These checks were once relevant for these extensions in PECL and PHP versions without availability of the checked macros. Closes GH-4405
1 parent e39296d commit 94421e5

File tree

7 files changed

+8
-33
lines changed

7 files changed

+8
-33
lines changed

ext/hash/config.m4

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,4 @@ EXT_HASH_HEADERS="php_hash.h php_hash_md.h php_hash_sha.h php_hash_ripemd.h \
4545
php_hash_fnv.h php_hash_joaat.h php_hash_sha3.h"
4646

4747
PHP_NEW_EXTENSION(hash, $EXT_HASH_SOURCES, 0,,$PHP_HASH_CFLAGS)
48-
ifdef([PHP_INSTALL_HEADERS], [
49-
PHP_INSTALL_HEADERS(ext/hash, $EXT_HASH_HEADERS)
50-
])
48+
PHP_INSTALL_HEADERS(ext/hash, $EXT_HASH_HEADERS)

ext/pdo/config.m4

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,8 @@ if test "$PHP_PDO" != "no"; then
1010
PHP_PDO=yes
1111

1212
PHP_NEW_EXTENSION(pdo, pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c, $ext_shared)
13-
ifdef([PHP_ADD_EXTENSION_DEP],
14-
[
15-
PHP_ADD_EXTENSION_DEP(pdo, spl, true)
16-
])
17-
18-
ifdef([PHP_INSTALL_HEADERS],
19-
[
20-
dnl Sadly, this is a complete NOP for pecl extensions
21-
PHP_INSTALL_HEADERS(ext/pdo, [php_pdo.h php_pdo_driver.h php_pdo_error.h])
22-
])
13+
PHP_ADD_EXTENSION_DEP(pdo, spl, true)
14+
PHP_INSTALL_HEADERS(ext/pdo, [php_pdo.h php_pdo_driver.h php_pdo_error.h])
2315

2416
dnl so we always include the known-good working hack.
2517
PHP_ADD_MAKEFILE_FRAGMENT

ext/pdo_dblib/config.m4

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,5 @@ if test "$PHP_PDO_DBLIB" != "no"; then
6363
AC_DEFINE(HAVE_FREETDS,1,[ ])
6464
PHP_SUBST(PDO_DBLIB_SHARED_LIBADD)
6565

66-
ifdef([PHP_ADD_EXTENSION_DEP],
67-
[
68-
PHP_ADD_EXTENSION_DEP(pdo_dblib, pdo)
69-
])
66+
PHP_ADD_EXTENSION_DEP(pdo_dblib, pdo)
7067
fi

ext/pdo_oci/config.m4

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,10 +218,7 @@ if test "$PHP_PDO_OCI" != "no"; then
218218
PHP_SUBST_OLD(PDO_OCI_DIR)
219219
PHP_SUBST_OLD(PDO_OCI_VERSION)
220220

221-
ifdef([PHP_ADD_EXTENSION_DEP],
222-
[
223-
PHP_ADD_EXTENSION_DEP(pdo_oci, pdo)
224-
])
221+
PHP_ADD_EXTENSION_DEP(pdo_oci, pdo)
225222

226223
AC_DEFINE_UNQUOTED(PHP_PDO_OCI_CLIENT_VERSION, "$PDO_OCI_VERSION", [ ])
227224
fi

ext/pdo_odbc/config.m4

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,5 @@ functions required for PDO support.
140140

141141
PHP_NEW_EXTENSION(pdo_odbc, pdo_odbc.c odbc_driver.c odbc_stmt.c, $ext_shared,,-I$pdo_cv_inc_path $PDO_ODBC_INCLUDE)
142142
PHP_SUBST(PDO_ODBC_SHARED_LIBADD)
143-
ifdef([PHP_ADD_EXTENSION_DEP],
144-
[
145-
PHP_ADD_EXTENSION_DEP(pdo_odbc, pdo)
146-
])
143+
PHP_ADD_EXTENSION_DEP(pdo_odbc, pdo)
147144
fi

ext/pdo_pgsql/config.m4

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,5 @@ if test "$PHP_PDO_PGSQL" != "no"; then
8686
PHP_CHECK_PDO_INCLUDES
8787

8888
PHP_NEW_EXTENSION(pdo_pgsql, pdo_pgsql.c pgsql_driver.c pgsql_statement.c, $ext_shared,,-I$pdo_cv_inc_path)
89-
ifdef([PHP_ADD_EXTENSION_DEP],
90-
[
91-
PHP_ADD_EXTENSION_DEP(pdo_pgsql, pdo)
92-
])
89+
PHP_ADD_EXTENSION_DEP(pdo_pgsql, pdo)
9390
fi

ext/pdo_sqlite/config.m4

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,5 @@ if test "$PHP_PDO_SQLITE" != "no"; then
4242
dnl Solaris fix
4343
PHP_CHECK_LIBRARY(rt, fdatasync, [PHP_ADD_LIBRARY(rt,, PDO_SQLITE_SHARED_LIBADD)])
4444

45-
ifdef([PHP_ADD_EXTENSION_DEP],
46-
[
47-
PHP_ADD_EXTENSION_DEP(pdo_sqlite, pdo)
48-
])
45+
PHP_ADD_EXTENSION_DEP(pdo_sqlite, pdo)
4946
fi

0 commit comments

Comments
 (0)