archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.4'

Browse source 
* PHP-7.4:
  Remove conditional calls of always available macros
This commit is contained in:
Peter Kokot 2019-07-14 22:24:59 +02:00
commit f91ffe5915
7 changed files with 8 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/hash/config.m4
View file

@ -42,6 +42,4 @@ EXT_HASH_HEADERS="php_hash.h php_hash_md.h php_hash_sha.h php_hash_ripemd.h \
php_hash_fnv.h php_hash_joaat.h php_hash_sha3.h" php_hash_fnv.h php_hash_joaat.h php_hash_sha3.h"
PHP_NEW_EXTENSION(hash, $EXT_HASH_SOURCES, 0,,$PHP_HASH_CFLAGS) PHP_NEW_EXTENSION(hash, $EXT_HASH_SOURCES, 0,,$PHP_HASH_CFLAGS)
ifdef([PHP_INSTALL_HEADERS], [ PHP_INSTALL_HEADERS(ext/hash, $EXT_HASH_HEADERS)
PHP_INSTALL_HEADERS(ext/hash, $EXT_HASH_HEADERS)
])

12
ext/pdo/config.m4
View file

@ -10,16 +10,8 @@ if test "$PHP_PDO" != "no"; then
PHP_PDO=yes PHP_PDO=yes
PHP_NEW_EXTENSION(pdo, pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c, $ext_shared) PHP_NEW_EXTENSION(pdo, pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c, $ext_shared)
ifdef([PHP_ADD_EXTENSION_DEP], PHP_ADD_EXTENSION_DEP(pdo, spl, true)
[ PHP_INSTALL_HEADERS(ext/pdo, [php_pdo.h php_pdo_driver.h php_pdo_error.h])
PHP_ADD_EXTENSION_DEP(pdo, spl, true)
])
ifdef([PHP_INSTALL_HEADERS],
[
dnl Sadly, this is a complete NOP for pecl extensions
PHP_INSTALL_HEADERS(ext/pdo, [php_pdo.h php_pdo_driver.h php_pdo_error.h])
])
dnl so we always include the known-good working hack. dnl so we always include the known-good working hack.
PHP_ADD_MAKEFILE_FRAGMENT PHP_ADD_MAKEFILE_FRAGMENT

5
ext/pdo_dblib/config.m4
View file

@ -63,8 +63,5 @@ if test "$PHP_PDO_DBLIB" != "no"; then
AC_DEFINE(HAVE_FREETDS,1,[ ]) AC_DEFINE(HAVE_FREETDS,1,[ ])
PHP_SUBST(PDO_DBLIB_SHARED_LIBADD) PHP_SUBST(PDO_DBLIB_SHARED_LIBADD)
ifdef([PHP_ADD_EXTENSION_DEP], PHP_ADD_EXTENSION_DEP(pdo_dblib, pdo)
[
PHP_ADD_EXTENSION_DEP(pdo_dblib, pdo)
])
fi fi

5
ext/pdo_oci/config.m4
View file

@ -218,10 +218,7 @@ if test "$PHP_PDO_OCI" != "no"; then
PHP_SUBST_OLD(PDO_OCI_DIR) PHP_SUBST_OLD(PDO_OCI_DIR)
PHP_SUBST_OLD(PDO_OCI_VERSION) PHP_SUBST_OLD(PDO_OCI_VERSION)
ifdef([PHP_ADD_EXTENSION_DEP], PHP_ADD_EXTENSION_DEP(pdo_oci, pdo)
[
PHP_ADD_EXTENSION_DEP(pdo_oci, pdo)
])
AC_DEFINE_UNQUOTED(PHP_PDO_OCI_CLIENT_VERSION, "$PDO_OCI_VERSION", [ ]) AC_DEFINE_UNQUOTED(PHP_PDO_OCI_CLIENT_VERSION, "$PDO_OCI_VERSION", [ ])
fi fi

5
ext/pdo_odbc/config.m4
View file

@ -140,8 +140,5 @@ functions required for PDO support.
PHP_NEW_EXTENSION(pdo_odbc, pdo_odbc.c odbc_driver.c odbc_stmt.c, $ext_shared,,-I$pdo_cv_inc_path $PDO_ODBC_INCLUDE) PHP_NEW_EXTENSION(pdo_odbc, pdo_odbc.c odbc_driver.c odbc_stmt.c, $ext_shared,,-I$pdo_cv_inc_path $PDO_ODBC_INCLUDE)
PHP_SUBST(PDO_ODBC_SHARED_LIBADD) PHP_SUBST(PDO_ODBC_SHARED_LIBADD)
ifdef([PHP_ADD_EXTENSION_DEP], PHP_ADD_EXTENSION_DEP(pdo_odbc, pdo)
[
PHP_ADD_EXTENSION_DEP(pdo_odbc, pdo)
])
fi fi

5
ext/pdo_pgsql/config.m4
View file

@ -86,8 +86,5 @@ if test "$PHP_PDO_PGSQL" != "no"; then
PHP_CHECK_PDO_INCLUDES PHP_CHECK_PDO_INCLUDES
PHP_NEW_EXTENSION(pdo_pgsql, pdo_pgsql.c pgsql_driver.c pgsql_statement.c, $ext_shared,,-I$pdo_cv_inc_path) PHP_NEW_EXTENSION(pdo_pgsql, pdo_pgsql.c pgsql_driver.c pgsql_statement.c, $ext_shared,,-I$pdo_cv_inc_path)
ifdef([PHP_ADD_EXTENSION_DEP], PHP_ADD_EXTENSION_DEP(pdo_pgsql, pdo)
[
PHP_ADD_EXTENSION_DEP(pdo_pgsql, pdo)
])
fi fi

5
ext/pdo_sqlite/config.m4
View file

@ -42,8 +42,5 @@ if test "$PHP_PDO_SQLITE" != "no"; then
dnl Solaris fix dnl Solaris fix
PHP_CHECK_LIBRARY(rt, fdatasync, [PHP_ADD_LIBRARY(rt,, PDO_SQLITE_SHARED_LIBADD)]) PHP_CHECK_LIBRARY(rt, fdatasync, [PHP_ADD_LIBRARY(rt,, PDO_SQLITE_SHARED_LIBADD)])
ifdef([PHP_ADD_EXTENSION_DEP], PHP_ADD_EXTENSION_DEP(pdo_sqlite, pdo)
[
PHP_ADD_EXTENSION_DEP(pdo_sqlite, pdo)
])
fi fi