From 11accb5cdff7977388fb604698fc7133f6491c0a Mon Sep 17 00:00:00 2001 From: Arnaud Le Blanc Date: Wed, 26 Jun 2024 00:26:43 +0200 Subject: [PATCH] Preferably include from build dir (#13516) * Include from build dir first This fixes out of tree builds by ensuring that configure artifacts are included from the build dir. Before, out of tree builds would preferably include files from the src dir, as the include path was defined as follows (ignoring includes from ext/ and sapi/) : -I$(top_builddir)/main -I$(top_srcdir) -I$(top_builddir)/TSRM -I$(top_builddir)/Zend -I$(top_srcdir)/main -I$(top_srcdir)/Zend -I$(top_srcdir)/TSRM -I$(top_builddir)/ As a result, an out of tree build would include configure artifacts such as `main/php_config.h` from the src dir. After this change, the include path is defined as follows: -I$(top_builddir)/main -I$(top_builddir) -I$(top_srcdir)/main -I$(top_srcdir) -I$(top_builddir)/TSRM -I$(top_builddir)/Zend -I$(top_srcdir)/Zend -I$(top_srcdir)/TSRM * Fix extension include path for out of tree builds * Include config.h with the brackets form `#include "config.h"` searches in the directory containing the including-file before any other include path. This can include the wrong config.h when building out of tree and a config.h exists in the source tree. Using `#include ` uses exclusively the include path, and gives priority to the build dir. --- TSRM/TSRM.h | 4 ++-- build/Makefile.global | 3 +-- configure.ac | 15 ++++++++------- ext/bcmath/bcmath.c | 2 +- ext/bz2/bz2.c | 2 +- ext/bz2/bz2_filter.c | 2 +- ext/calendar/calendar.c | 2 +- ext/com_dotnet/com_com.c | 2 +- ext/com_dotnet/com_dotnet.c | 2 +- ext/com_dotnet/com_extension.c | 2 +- ext/com_dotnet/com_handlers.c | 2 +- ext/com_dotnet/com_iterator.c | 2 +- ext/com_dotnet/com_misc.c | 2 +- ext/com_dotnet/com_olechar.c | 2 +- ext/com_dotnet/com_persist.c | 2 +- ext/com_dotnet/com_saproxy.c | 2 +- ext/com_dotnet/com_typeinfo.c | 2 +- ext/com_dotnet/com_variant.c | 2 +- ext/com_dotnet/com_wrapper.c | 2 +- ext/ctype/ctype.c | 2 +- ext/curl/interface.c | 2 +- ext/curl/multi.c | 2 +- ext/curl/share.c | 2 +- ext/dba/dba.c | 2 +- ext/dba/dba_cdb.c | 2 +- ext/dba/dba_db1.c | 2 +- ext/dba/dba_db2.c | 2 +- ext/dba/dba_db3.c | 2 +- ext/dba/dba_db4.c | 2 +- ext/dba/dba_dbm.c | 2 +- ext/dba/dba_flatfile.c | 2 +- ext/dba/dba_gdbm.c | 2 +- ext/dba/dba_inifile.c | 2 +- ext/dba/dba_lmdb.c | 2 +- ext/dba/dba_ndbm.c | 2 +- ext/dba/dba_qdbm.c | 2 +- ext/dba/dba_tcadb.c | 2 +- ext/dom/attr.c | 2 +- ext/dom/cdatasection.c | 2 +- ext/dom/characterdata.c | 2 +- ext/dom/comment.c | 2 +- ext/dom/document.c | 2 +- ext/dom/documentfragment.c | 2 +- ext/dom/documenttype.c | 2 +- ext/dom/dom_iterators.c | 2 +- ext/dom/domexception.c | 2 +- ext/dom/domimplementation.c | 2 +- ext/dom/element.c | 2 +- ext/dom/entity.c | 2 +- ext/dom/entityreference.c | 2 +- ext/dom/html5_parser.c | 2 +- ext/dom/html5_serializer.c | 2 +- ext/dom/html_document.c | 2 +- ext/dom/namednodemap.c | 2 +- ext/dom/namespace_compat.c | 2 +- ext/dom/node.c | 2 +- ext/dom/nodelist.c | 2 +- ext/dom/notation.c | 2 +- ext/dom/parentnode.c | 2 +- ext/dom/php_dom.c | 2 +- ext/dom/processinginstruction.c | 2 +- ext/dom/text.c | 2 +- ext/dom/xml_document.c | 2 +- ext/dom/xpath.c | 2 +- ext/dom/xpath_callbacks.c | 2 +- ext/enchant/enchant.c | 2 +- ext/exif/exif.c | 2 +- ext/fileinfo/fileinfo.c | 2 +- ext/filter/filter.c | 2 +- ext/ftp/ftp.c | 2 +- ext/ftp/php_ftp.c | 2 +- ext/gd/gd.c | 2 +- ext/gd/gd_compat.c | 4 ++-- ext/gettext/gettext.c | 2 +- ext/gmp/gmp.c | 2 +- ext/gmp/php_gmp_int.h | 2 +- ext/hash/hash.c | 2 +- ext/iconv/iconv.c | 2 +- ext/intl/collator/collator_attr.c | 2 +- ext/intl/collator/collator_compare.c | 2 +- ext/intl/collator/collator_convert.c | 2 +- ext/intl/collator/collator_create.c | 2 +- ext/intl/collator/collator_error.c | 2 +- ext/intl/collator/collator_locale.c | 2 +- ext/intl/collator/collator_sort.c | 2 +- ext/intl/common/common_error.c | 2 +- ext/intl/converter/converter.h | 2 +- ext/intl/dateformat/dateformat.c | 2 +- ext/intl/dateformat/dateformat_attr.c | 2 +- ext/intl/dateformat/dateformat_data.c | 2 +- ext/intl/dateformat/dateformat_format.c | 2 +- ext/intl/dateformat/dateformat_parse.c | 2 +- ext/intl/formatter/formatter_attr.c | 2 +- ext/intl/formatter/formatter_data.c | 2 +- ext/intl/formatter/formatter_format.c | 2 +- ext/intl/formatter/formatter_main.c | 2 +- ext/intl/formatter/formatter_parse.c | 2 +- ext/intl/grapheme/grapheme_string.c | 2 +- ext/intl/grapheme/grapheme_util.c | 2 +- ext/intl/idn/idn.c | 2 +- ext/intl/intl_convert.c | 2 +- ext/intl/intl_error.c | 2 +- ext/intl/locale/locale.c | 2 +- ext/intl/locale/locale_methods.c | 2 +- ext/intl/msgformat/msgformat.c | 2 +- ext/intl/msgformat/msgformat_attr.c | 2 +- ext/intl/msgformat/msgformat_data.c | 2 +- ext/intl/msgformat/msgformat_format.c | 2 +- ext/intl/msgformat/msgformat_parse.c | 2 +- ext/intl/normalizer/normalizer_normalize.c | 2 +- ext/intl/php_intl.c | 2 +- ext/intl/spoofchecker/spoofchecker_create.c | 2 +- ext/intl/spoofchecker/spoofchecker_main.c | 2 +- ext/intl/transliterator/transliterator_methods.c | 2 +- ext/json/json.c | 2 +- ext/json/json_encoder.c | 2 +- ext/ldap/ldap.c | 2 +- ext/mysqli/mysqli.c | 2 +- ext/mysqli/mysqli_api.c | 2 +- ext/mysqli/mysqli_driver.c | 2 +- ext/mysqli/mysqli_exception.c | 2 +- ext/mysqli/mysqli_nonapi.c | 2 +- ext/mysqli/mysqli_prop.c | 2 +- ext/mysqli/mysqli_report.c | 2 +- ext/mysqli/mysqli_result_iterator.c | 2 +- ext/mysqli/mysqli_warning.c | 2 +- ext/mysqlnd/php_mysqlnd.c | 2 +- ext/odbc/php_odbc.c | 2 +- ext/openssl/openssl.c | 2 +- ext/openssl/xp_ssl.c | 2 +- ext/pcntl/pcntl.c | 2 +- ext/pdo/pdo.c | 2 +- ext/pdo/pdo_dbh.c | 2 +- ext/pdo/pdo_sqlstate.c | 2 +- ext/pdo/pdo_stmt.c | 2 +- ext/pdo_firebird/firebird_driver.c | 2 +- ext/pdo_firebird/firebird_statement.c | 2 +- ext/pdo_firebird/pdo_firebird.c | 2 +- ext/pdo_mysql/mysql_driver.c | 2 +- ext/pdo_mysql/mysql_statement.c | 2 +- ext/pdo_mysql/pdo_mysql.c | 2 +- ext/pdo_odbc/odbc_driver.c | 2 +- ext/pdo_odbc/odbc_stmt.c | 2 +- ext/pdo_odbc/pdo_odbc.c | 2 +- ext/pdo_pgsql/pdo_pgsql.c | 2 +- ext/pdo_pgsql/pgsql_driver.c | 2 +- ext/pdo_pgsql/pgsql_statement.c | 2 +- ext/pdo_sqlite/pdo_sqlite.c | 2 +- ext/pdo_sqlite/sqlite_driver.c | 2 +- ext/pdo_sqlite/sqlite_statement.c | 2 +- ext/pgsql/pgsql.c | 2 +- ext/phar/phar_internal.h | 2 +- ext/posix/php_posix.h | 2 +- ext/posix/posix.c | 2 +- ext/readline/readline.c | 2 +- ext/readline/readline_cli.c | 2 +- ext/reflection/php_reflection.c | 2 +- ext/session/session.c | 2 +- ext/shmop/shmop.c | 2 +- ext/simplexml/simplexml.c | 2 +- ext/skeleton/skeleton.c | 2 +- ext/snmp/snmp.c | 2 +- ext/soap/soap.c | 2 +- ext/sockets/multicast.c | 2 +- ext/sockets/sockets.c | 2 +- ext/spl/php_spl.c | 2 +- ext/spl/spl_fixedarray.c | 2 +- ext/spl/spl_functions.c | 2 +- ext/sqlite3/sqlite3.c | 2 +- ext/sysvmsg/sysvmsg.c | 2 +- ext/sysvsem/sysvsem.c | 2 +- ext/sysvshm/sysvshm.c | 2 +- ext/tidy/tidy.c | 2 +- ext/tokenizer/tokenizer.c | 2 +- ext/xml/xml.c | 2 +- ext/xmlreader/php_xmlreader.c | 2 +- ext/xmlwriter/php_xmlwriter.c | 2 +- ext/xsl/php_xsl.c | 2 +- ext/xsl/xsltprocessor.c | 2 +- ext/zip/php_zip.c | 2 +- ext/zlib/zlib.c | 2 +- main/php_odbc_utils.c | 2 +- sapi/cli/php_cli_process_title.c | 2 +- sapi/cli/php_cli_server.c | 2 +- sapi/cli/php_http_parser.h | 2 +- sapi/cli/ps_title.c | 2 +- sapi/fuzzer/fuzzer-exif.c | 2 +- sapi/fuzzer/fuzzer-json.c | 2 +- sapi/fuzzer/fuzzer-mbregex.c | 2 +- sapi/fuzzer/fuzzer-unserialize.c | 2 +- sapi/fuzzer/fuzzer-unserializehash.c | 2 +- sapi/phpdbg/phpdbg.h | 2 +- sapi/phpdbg/phpdbg_io.c | 2 +- 193 files changed, 202 insertions(+), 202 deletions(-) diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h index 704f57b9a2c..80d6cbad044 100644 --- a/TSRM/TSRM.h +++ b/TSRM/TSRM.h @@ -15,9 +15,9 @@ #if !defined(__CYGWIN__) && defined(_WIN32) # define TSRM_WIN32 -# include "Zend/zend_config.w32.h" +# include #else -# include "main/php_config.h" +# include
#endif #include diff --git a/build/Makefile.global b/build/Makefile.global index 7ac18866e6d..466acc9e635 100644 --- a/build/Makefile.global +++ b/build/Makefile.global @@ -2,8 +2,7 @@ mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p INSTALL = $(top_srcdir)/build/shtool install -c INSTALL_DATA = $(INSTALL) -m 644 -DEFS = -I$(top_builddir)/main -I$(top_srcdir) -COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH) +COMMON_FLAGS = $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH) all: $(all_targets) @echo diff --git a/configure.ac b/configure.ac index 73bb6be5511..abac45d7131 100644 --- a/configure.ac +++ b/configure.ac @@ -1353,13 +1353,14 @@ LIBZEND_BASIC_CHECKS LIBZEND_DLSYM_CHECK LIBZEND_OTHER_CHECKS -INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM" -INCLUDES="$INCLUDES -I\$(top_builddir)/Zend" - -if test "$abs_srcdir" != "$abs_builddir"; then - INCLUDES="$INCLUDES -I\$(top_srcdir)/main -I\$(top_srcdir)/Zend" - INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM -I\$(top_builddir)/" -fi +PHP_ADD_INCLUDE([$abs_srcdir], [1]) +PHP_ADD_INCLUDE([$abs_srcdir/main], [1]) +PHP_ADD_INCLUDE([$abs_builddir], [1]) +PHP_ADD_INCLUDE([$abs_builddir/main], [1]) +PHP_ADD_INCLUDE([$abs_builddir/TSRM]) +PHP_ADD_INCLUDE([$abs_builddir/Zend]) +PHP_ADD_INCLUDE([$abs_srcdir/Zend]) +PHP_ADD_INCLUDE([$abs_srcdir/TSRM]) ZEND_EXTRA_LIBS="$LIBS" unset LIBS diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c index 0258c0cd3a5..f7375ffadc2 100644 --- a/ext/bcmath/bcmath.c +++ b/ext/bcmath/bcmath.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c index c74483e6a81..0e777851a5f 100644 --- a/ext/bz2/bz2.c +++ b/ext/bz2/bz2.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/bz2/bz2_filter.c b/ext/bz2/bz2_filter.c index 9b3480b4a5c..bdeb280bfa6 100644 --- a/ext/bz2/bz2_filter.c +++ b/ext/bz2/bz2_filter.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c index 756ce0e90dc..f9212f621f7 100644 --- a/ext/calendar/calendar.c +++ b/ext/calendar/calendar.c @@ -18,7 +18,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/com_dotnet/com_com.c b/ext/com_dotnet/com_com.c index 65507a00ed1..24063c5c550 100644 --- a/ext/com_dotnet/com_com.c +++ b/ext/com_dotnet/com_com.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/com_dotnet/com_dotnet.c b/ext/com_dotnet/com_dotnet.c index a43fa7cfc69..1b479a2d34d 100644 --- a/ext/com_dotnet/com_dotnet.c +++ b/ext/com_dotnet/com_dotnet.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/com_dotnet/com_extension.c b/ext/com_dotnet/com_extension.c index 6714db4e523..bd9f981be13 100644 --- a/ext/com_dotnet/com_extension.c +++ b/ext/com_dotnet/com_extension.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/com_dotnet/com_handlers.c b/ext/com_dotnet/com_handlers.c index 1965153f027..a5c68bb7b99 100644 --- a/ext/com_dotnet/com_handlers.c +++ b/ext/com_dotnet/com_handlers.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/com_dotnet/com_iterator.c b/ext/com_dotnet/com_iterator.c index 9aaf5e96ab4..931e4a9afdd 100644 --- a/ext/com_dotnet/com_iterator.c +++ b/ext/com_dotnet/com_iterator.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/com_dotnet/com_misc.c b/ext/com_dotnet/com_misc.c index 39d245b7d01..3c85fc4ce5e 100644 --- a/ext/com_dotnet/com_misc.c +++ b/ext/com_dotnet/com_misc.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/com_dotnet/com_olechar.c b/ext/com_dotnet/com_olechar.c index 560524e45d1..d04f8b18c62 100644 --- a/ext/com_dotnet/com_olechar.c +++ b/ext/com_dotnet/com_olechar.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/com_dotnet/com_persist.c b/ext/com_dotnet/com_persist.c index 0a0352603e1..56c613e54d0 100644 --- a/ext/com_dotnet/com_persist.c +++ b/ext/com_dotnet/com_persist.c @@ -20,7 +20,7 @@ * (can wait till 5.1) */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/com_dotnet/com_saproxy.c b/ext/com_dotnet/com_saproxy.c index 83c37964a9f..c68001b1b31 100644 --- a/ext/com_dotnet/com_saproxy.c +++ b/ext/com_dotnet/com_saproxy.c @@ -22,7 +22,7 @@ * */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/com_dotnet/com_typeinfo.c b/ext/com_dotnet/com_typeinfo.c index ccdcc3ff7e8..f5094942914 100644 --- a/ext/com_dotnet/com_typeinfo.c +++ b/ext/com_dotnet/com_typeinfo.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/com_dotnet/com_variant.c b/ext/com_dotnet/com_variant.c index 5b763718844..0a6cc5e169f 100644 --- a/ext/com_dotnet/com_variant.c +++ b/ext/com_dotnet/com_variant.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/com_dotnet/com_wrapper.c b/ext/com_dotnet/com_wrapper.c index a2bb419340e..621bce4202b 100644 --- a/ext/com_dotnet/com_wrapper.c +++ b/ext/com_dotnet/com_wrapper.c @@ -18,7 +18,7 @@ * using IDispatchEx */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/ctype/ctype.c b/ext/ctype/ctype.c index 510930936e4..b4835019602 100644 --- a/ext/ctype/ctype.c +++ b/ext/ctype/ctype.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/curl/interface.c b/ext/curl/interface.c index dae8eae3453..57860607be8 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -17,7 +17,7 @@ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/curl/multi.c b/ext/curl/multi.c index 586f48911b2..3c453edd450 100644 --- a/ext/curl/multi.c +++ b/ext/curl/multi.c @@ -17,7 +17,7 @@ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/curl/share.c b/ext/curl/share.c index f30790250e0..406982d2032 100644 --- a/ext/curl/share.c +++ b/ext/curl/share.c @@ -17,7 +17,7 @@ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dba/dba.c b/ext/dba/dba.c index e6e9512f230..c720a441784 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dba/dba_cdb.c b/ext/dba/dba_cdb.c index ac6a2452671..10a381b579d 100644 --- a/ext/dba/dba_cdb.c +++ b/ext/dba/dba_cdb.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dba/dba_db1.c b/ext/dba/dba_db1.c index 57dfab38f13..e4b83fcb55f 100644 --- a/ext/dba/dba_db1.c +++ b/ext/dba/dba_db1.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dba/dba_db2.c b/ext/dba/dba_db2.c index 86306bd59a2..5ec3df182e8 100644 --- a/ext/dba/dba_db2.c +++ b/ext/dba/dba_db2.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dba/dba_db3.c b/ext/dba/dba_db3.c index 5d36d86e008..8efc8d45b3b 100644 --- a/ext/dba/dba_db3.c +++ b/ext/dba/dba_db3.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dba/dba_db4.c b/ext/dba/dba_db4.c index a2dbd5dafa1..f64db5540ee 100644 --- a/ext/dba/dba_db4.c +++ b/ext/dba/dba_db4.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dba/dba_dbm.c b/ext/dba/dba_dbm.c index 044d9c156be..b6d98d22893 100644 --- a/ext/dba/dba_dbm.c +++ b/ext/dba/dba_dbm.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dba/dba_flatfile.c b/ext/dba/dba_flatfile.c index 9d5b31128c0..997e6b9cc11 100644 --- a/ext/dba/dba_flatfile.c +++ b/ext/dba/dba_flatfile.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dba/dba_gdbm.c b/ext/dba/dba_gdbm.c index 0781e1fb1a7..245c79e0e62 100644 --- a/ext/dba/dba_gdbm.c +++ b/ext/dba/dba_gdbm.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dba/dba_inifile.c b/ext/dba/dba_inifile.c index fe0adbccbfe..00b99d55b00 100644 --- a/ext/dba/dba_inifile.c +++ b/ext/dba/dba_inifile.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dba/dba_lmdb.c b/ext/dba/dba_lmdb.c index f147f4c810d..f6bdc7838a6 100644 --- a/ext/dba/dba_lmdb.c +++ b/ext/dba/dba_lmdb.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dba/dba_ndbm.c b/ext/dba/dba_ndbm.c index 758fcd1e771..40ae304cb7d 100644 --- a/ext/dba/dba_ndbm.c +++ b/ext/dba/dba_ndbm.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dba/dba_qdbm.c b/ext/dba/dba_qdbm.c index d70885754be..5cbfeee874d 100644 --- a/ext/dba/dba_qdbm.c +++ b/ext/dba/dba_qdbm.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dba/dba_tcadb.c b/ext/dba/dba_tcadb.c index b085558a711..6f4cb01e69e 100644 --- a/ext/dba/dba_tcadb.c +++ b/ext/dba/dba_tcadb.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/attr.c b/ext/dom/attr.c index 99686acb61f..9ceb616d178 100644 --- a/ext/dom/attr.c +++ b/ext/dom/attr.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/cdatasection.c b/ext/dom/cdatasection.c index d8d1c1c7e30..6d063e19d43 100644 --- a/ext/dom/cdatasection.c +++ b/ext/dom/cdatasection.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/characterdata.c b/ext/dom/characterdata.c index bc76908a470..b17679655be 100644 --- a/ext/dom/characterdata.c +++ b/ext/dom/characterdata.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/comment.c b/ext/dom/comment.c index 5e13c8efee7..211d27d2c31 100644 --- a/ext/dom/comment.c +++ b/ext/dom/comment.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/document.c b/ext/dom/document.c index cb6e8aeb3f2..5bbe99eb364 100644 --- a/ext/dom/document.c +++ b/ext/dom/document.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/documentfragment.c b/ext/dom/documentfragment.c index e4b5d183c0a..74b7f073741 100644 --- a/ext/dom/documentfragment.c +++ b/ext/dom/documentfragment.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/documenttype.c b/ext/dom/documenttype.c index 5fe9f3626ff..666dae56dc0 100644 --- a/ext/dom/documenttype.c +++ b/ext/dom/documenttype.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/dom_iterators.c b/ext/dom/dom_iterators.c index 227cdafd65a..41bd65f3964 100644 --- a/ext/dom/dom_iterators.c +++ b/ext/dom/dom_iterators.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/domexception.c b/ext/dom/domexception.c index b9771fb0385..86eecd579b2 100644 --- a/ext/dom/domexception.c +++ b/ext/dom/domexception.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/domimplementation.c b/ext/dom/domimplementation.c index b1778f8f8fd..58a50b06d07 100644 --- a/ext/dom/domimplementation.c +++ b/ext/dom/domimplementation.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/element.c b/ext/dom/element.c index 6a9c69d57b8..6bf77dcafdd 100644 --- a/ext/dom/element.c +++ b/ext/dom/element.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/entity.c b/ext/dom/entity.c index 2943e364ed4..814dc3e7066 100644 --- a/ext/dom/entity.c +++ b/ext/dom/entity.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/entityreference.c b/ext/dom/entityreference.c index c0b640d39aa..26f7e830768 100644 --- a/ext/dom/entityreference.c +++ b/ext/dom/entityreference.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/html5_parser.c b/ext/dom/html5_parser.c index 13fbbe58149..718a05a5db1 100644 --- a/ext/dom/html5_parser.c +++ b/ext/dom/html5_parser.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/html5_serializer.c b/ext/dom/html5_serializer.c index 2f5a12737e9..215acb6da95 100644 --- a/ext/dom/html5_serializer.c +++ b/ext/dom/html5_serializer.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/html_document.c b/ext/dom/html_document.c index a7f6f957ada..9fef8c25a8a 100644 --- a/ext/dom/html_document.c +++ b/ext/dom/html_document.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/namednodemap.c b/ext/dom/namednodemap.c index 1fca749372f..bc867aba438 100644 --- a/ext/dom/namednodemap.c +++ b/ext/dom/namednodemap.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/namespace_compat.c b/ext/dom/namespace_compat.c index dd5bc685b54..232aa521415 100644 --- a/ext/dom/namespace_compat.c +++ b/ext/dom/namespace_compat.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/node.c b/ext/dom/node.c index 5200a4d3cc4..8df57d46800 100644 --- a/ext/dom/node.c +++ b/ext/dom/node.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/nodelist.c b/ext/dom/nodelist.c index 2ee177c89bd..9e6212de53b 100644 --- a/ext/dom/nodelist.c +++ b/ext/dom/nodelist.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/notation.c b/ext/dom/notation.c index 021df2f6fe8..a15fae9ee9d 100644 --- a/ext/dom/notation.c +++ b/ext/dom/notation.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/parentnode.c b/ext/dom/parentnode.c index 3969ee5e970..b0fa54bf7dc 100644 --- a/ext/dom/parentnode.c +++ b/ext/dom/parentnode.c @@ -18,7 +18,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c index 55779f2e9ba..2d21a891ca5 100644 --- a/ext/dom/php_dom.c +++ b/ext/dom/php_dom.c @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/processinginstruction.c b/ext/dom/processinginstruction.c index 9b3ef3c0810..eda15720eab 100644 --- a/ext/dom/processinginstruction.c +++ b/ext/dom/processinginstruction.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/text.c b/ext/dom/text.c index 4411fb35d0d..ef0d5d0cef6 100644 --- a/ext/dom/text.c +++ b/ext/dom/text.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/xml_document.c b/ext/dom/xml_document.c index 9844137d85c..81c42f276db 100644 --- a/ext/dom/xml_document.c +++ b/ext/dom/xml_document.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c index d33d3f07a27..ac390aa649a 100644 --- a/ext/dom/xpath.c +++ b/ext/dom/xpath.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/dom/xpath_callbacks.c b/ext/dom/xpath_callbacks.c index 3c67534514c..cd2ecf4335d 100644 --- a/ext/dom/xpath_callbacks.c +++ b/ext/dom/xpath_callbacks.c @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c index 7cb40da042e..847f7c466b7 100644 --- a/ext/enchant/enchant.c +++ b/ext/enchant/enchant.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/exif/exif.c b/ext/exif/exif.c index a785690a21f..7e9df52af5b 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c index c3047233dbb..8680722ae95 100644 --- a/ext/fileinfo/fileinfo.c +++ b/ext/fileinfo/fileinfo.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/filter/filter.c b/ext/filter/filter.c index 0554bd62c0d..c9d0f256b59 100644 --- a/ext/filter/filter.c +++ b/ext/filter/filter.c @@ -18,7 +18,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php_filter.h" diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c index 908130d62aa..4693787607b 100644 --- a/ext/ftp/ftp.c +++ b/ext/ftp/ftp.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c index 11763acbd17..0336f9e9537 100644 --- a/ext/ftp/php_ftp.c +++ b/ext/ftp/php_ftp.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/gd/gd.c b/ext/gd/gd.c index eb282ec2328..bd14b3af8a5 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -22,7 +22,7 @@ /* Note that there is no code from the gd package in this file */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/gd/gd_compat.c b/ext/gd/gd_compat.c index 51692c47a4e..2b9e85eccfe 100644 --- a/ext/gd/gd_compat.c +++ b/ext/gd/gd_compat.c @@ -1,7 +1,7 @@ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #else -#include "php_config.h" +#include #endif #include "gd_compat.h" diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c index a9210701970..939619bfb3b 100644 --- a/ext/gettext/gettext.c +++ b/ext/gettext/gettext.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c index 295b9e4759f..63838ad2a6e 100644 --- a/ext/gmp/gmp.c +++ b/ext/gmp/gmp.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/gmp/php_gmp_int.h b/ext/gmp/php_gmp_int.h index c37fdb136d0..d67fdd5c622 100644 --- a/ext/gmp/php_gmp_int.h +++ b/ext/gmp/php_gmp_int.h @@ -2,7 +2,7 @@ #define incl_PHP_GMP_INT_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/hash/hash.c b/ext/hash/hash.c index 05b1de0c4c4..26cb3739a5f 100644 --- a/ext/hash/hash.c +++ b/ext/hash/hash.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index c1d85ffded7..4241b7c2887 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/intl/collator/collator_attr.c b/ext/intl/collator/collator_attr.c index be95b1909b3..f16ae0cc528 100644 --- a/ext/intl/collator/collator_attr.c +++ b/ext/intl/collator/collator_attr.c @@ -14,7 +14,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php_intl.h" diff --git a/ext/intl/collator/collator_compare.c b/ext/intl/collator/collator_compare.c index 6576398de52..f71d57f74f8 100644 --- a/ext/intl/collator/collator_compare.c +++ b/ext/intl/collator/collator_compare.c @@ -14,7 +14,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php_intl.h" diff --git a/ext/intl/collator/collator_convert.c b/ext/intl/collator/collator_convert.c index acf2b2f7d41..463348f2a19 100644 --- a/ext/intl/collator/collator_convert.c +++ b/ext/intl/collator/collator_convert.c @@ -14,7 +14,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php_intl.h" diff --git a/ext/intl/collator/collator_create.c b/ext/intl/collator/collator_create.c index 1f04f23f0f7..88dacc1c1db 100644 --- a/ext/intl/collator/collator_create.c +++ b/ext/intl/collator/collator_create.c @@ -14,7 +14,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php_intl.h" diff --git a/ext/intl/collator/collator_error.c b/ext/intl/collator/collator_error.c index cc9498db1b6..2189b312d7c 100644 --- a/ext/intl/collator/collator_error.c +++ b/ext/intl/collator/collator_error.c @@ -14,7 +14,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php_intl.h" diff --git a/ext/intl/collator/collator_locale.c b/ext/intl/collator/collator_locale.c index e2c9e254f38..e1cdcdf2a60 100644 --- a/ext/intl/collator/collator_locale.c +++ b/ext/intl/collator/collator_locale.c @@ -14,7 +14,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php_intl.h" diff --git a/ext/intl/collator/collator_sort.c b/ext/intl/collator/collator_sort.c index 0634e68fc7a..c28ffb82cf7 100644 --- a/ext/intl/collator/collator_sort.c +++ b/ext/intl/collator/collator_sort.c @@ -14,7 +14,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php_intl.h" diff --git a/ext/intl/common/common_error.c b/ext/intl/common/common_error.c index 2fb2f7b0f32..733a1913ad0 100644 --- a/ext/intl/common/common_error.c +++ b/ext/intl/common/common_error.c @@ -14,7 +14,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php_intl.h" diff --git a/ext/intl/converter/converter.h b/ext/intl/converter/converter.h index f04020a3de8..f9fb27b82a7 100644 --- a/ext/intl/converter/converter.h +++ b/ext/intl/converter/converter.h @@ -16,7 +16,7 @@ #define PHP_INTL_CONVERTER_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/intl/dateformat/dateformat.c b/ext/intl/dateformat/dateformat.c index df4a8860744..e6ebd5b7896 100644 --- a/ext/intl/dateformat/dateformat.c +++ b/ext/intl/dateformat/dateformat.c @@ -12,7 +12,7 @@ +----------------------------------------------------------------------+ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/intl/dateformat/dateformat_attr.c b/ext/intl/dateformat/dateformat_attr.c index ed760e23204..8032d758a93 100644 --- a/ext/intl/dateformat/dateformat_attr.c +++ b/ext/intl/dateformat/dateformat_attr.c @@ -12,7 +12,7 @@ +----------------------------------------------------------------------+ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "../php_intl.h" diff --git a/ext/intl/dateformat/dateformat_data.c b/ext/intl/dateformat/dateformat_data.c index 697d10e5ff0..9c12af6fb60 100644 --- a/ext/intl/dateformat/dateformat_data.c +++ b/ext/intl/dateformat/dateformat_data.c @@ -12,7 +12,7 @@ +----------------------------------------------------------------------+ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "dateformat_data.h" diff --git a/ext/intl/dateformat/dateformat_format.c b/ext/intl/dateformat/dateformat_format.c index 9419469b4f6..0d013233530 100644 --- a/ext/intl/dateformat/dateformat_format.c +++ b/ext/intl/dateformat/dateformat_format.c @@ -13,7 +13,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "../php_intl.h" diff --git a/ext/intl/dateformat/dateformat_parse.c b/ext/intl/dateformat/dateformat_parse.c index 82b5a71bbee..9a1c09b2af7 100644 --- a/ext/intl/dateformat/dateformat_parse.c +++ b/ext/intl/dateformat/dateformat_parse.c @@ -13,7 +13,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/intl/formatter/formatter_attr.c b/ext/intl/formatter/formatter_attr.c index fe50f716e81..874984f5405 100644 --- a/ext/intl/formatter/formatter_attr.c +++ b/ext/intl/formatter/formatter_attr.c @@ -13,7 +13,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php_intl.h" diff --git a/ext/intl/formatter/formatter_data.c b/ext/intl/formatter/formatter_data.c index 962148db348..57dbc8bde6b 100644 --- a/ext/intl/formatter/formatter_data.c +++ b/ext/intl/formatter/formatter_data.c @@ -13,7 +13,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "formatter_data.h" diff --git a/ext/intl/formatter/formatter_format.c b/ext/intl/formatter/formatter_format.c index 21ecf9771dd..0323757ed86 100644 --- a/ext/intl/formatter/formatter_format.c +++ b/ext/intl/formatter/formatter_format.c @@ -13,7 +13,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php_intl.h" diff --git a/ext/intl/formatter/formatter_main.c b/ext/intl/formatter/formatter_main.c index 05464310f0c..2719b9aa906 100644 --- a/ext/intl/formatter/formatter_main.c +++ b/ext/intl/formatter/formatter_main.c @@ -13,7 +13,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/intl/formatter/formatter_parse.c b/ext/intl/formatter/formatter_parse.c index b8ed48d9ece..de3b8191e9e 100644 --- a/ext/intl/formatter/formatter_parse.c +++ b/ext/intl/formatter/formatter_parse.c @@ -13,7 +13,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php_intl.h" diff --git a/ext/intl/grapheme/grapheme_string.c b/ext/intl/grapheme/grapheme_string.c index 0317779dc66..f33dab8eafa 100644 --- a/ext/intl/grapheme/grapheme_string.c +++ b/ext/intl/grapheme/grapheme_string.c @@ -14,7 +14,7 @@ /* {{{ includes */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/intl/grapheme/grapheme_util.c b/ext/intl/grapheme/grapheme_util.c index 13ddcb39921..408b31161d8 100644 --- a/ext/intl/grapheme/grapheme_util.c +++ b/ext/intl/grapheme/grapheme_util.c @@ -14,7 +14,7 @@ /* {{{ includes */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/intl/idn/idn.c b/ext/intl/idn/idn.c index af7a1809022..db8765837c1 100644 --- a/ext/intl/idn/idn.c +++ b/ext/intl/idn/idn.c @@ -17,7 +17,7 @@ /* {{{ includes */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/intl/intl_convert.c b/ext/intl/intl_convert.c index bb6d236fdfc..3514b81ffe7 100644 --- a/ext/intl/intl_convert.c +++ b/ext/intl/intl_convert.c @@ -14,7 +14,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/intl/intl_error.c b/ext/intl/intl_error.c index 857cab26241..a1c3a9efb2d 100644 --- a/ext/intl/intl_error.c +++ b/ext/intl/intl_error.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/intl/locale/locale.c b/ext/intl/locale/locale.c index cb7afabe2b7..76b269ca85e 100644 --- a/ext/intl/locale/locale.c +++ b/ext/intl/locale/locale.c @@ -13,7 +13,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "locale_class.h" diff --git a/ext/intl/locale/locale_methods.c b/ext/intl/locale/locale_methods.c index 3884b354192..373d71d2636 100644 --- a/ext/intl/locale/locale_methods.c +++ b/ext/intl/locale/locale_methods.c @@ -13,7 +13,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/intl/msgformat/msgformat.c b/ext/intl/msgformat/msgformat.c index e35d86eb802..51643d86d45 100644 --- a/ext/intl/msgformat/msgformat.c +++ b/ext/intl/msgformat/msgformat.c @@ -13,7 +13,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/intl/msgformat/msgformat_attr.c b/ext/intl/msgformat/msgformat_attr.c index 12df3741742..b56bf360d11 100644 --- a/ext/intl/msgformat/msgformat_attr.c +++ b/ext/intl/msgformat/msgformat_attr.c @@ -13,7 +13,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php_intl.h" diff --git a/ext/intl/msgformat/msgformat_data.c b/ext/intl/msgformat/msgformat_data.c index 6b20c238fe3..5d170d25945 100644 --- a/ext/intl/msgformat/msgformat_data.c +++ b/ext/intl/msgformat/msgformat_data.c @@ -13,7 +13,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/intl/msgformat/msgformat_format.c b/ext/intl/msgformat/msgformat_format.c index f6ec60fe199..46a364c5d3a 100644 --- a/ext/intl/msgformat/msgformat_format.c +++ b/ext/intl/msgformat/msgformat_format.c @@ -13,7 +13,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/intl/msgformat/msgformat_parse.c b/ext/intl/msgformat/msgformat_parse.c index faecf618022..c55671cf856 100644 --- a/ext/intl/msgformat/msgformat_parse.c +++ b/ext/intl/msgformat/msgformat_parse.c @@ -13,7 +13,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/intl/normalizer/normalizer_normalize.c b/ext/intl/normalizer/normalizer_normalize.c index ec819c275c7..eb55eaea5b7 100644 --- a/ext/intl/normalizer/normalizer_normalize.c +++ b/ext/intl/normalizer/normalizer_normalize.c @@ -13,7 +13,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php_intl.h" diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c index 7827774d9b4..eee9e77c19d 100644 --- a/ext/intl/php_intl.c +++ b/ext/intl/php_intl.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif diff --git a/ext/intl/spoofchecker/spoofchecker_create.c b/ext/intl/spoofchecker/spoofchecker_create.c index 1b718eb3079..c1cecac8412 100644 --- a/ext/intl/spoofchecker/spoofchecker_create.c +++ b/ext/intl/spoofchecker/spoofchecker_create.c @@ -13,7 +13,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php_intl.h" diff --git a/ext/intl/spoofchecker/spoofchecker_main.c b/ext/intl/spoofchecker/spoofchecker_main.c index 3e5f7c25854..0d747d6c0f1 100644 --- a/ext/intl/spoofchecker/spoofchecker_main.c +++ b/ext/intl/spoofchecker/spoofchecker_main.c @@ -13,7 +13,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php_intl.h" diff --git a/ext/intl/transliterator/transliterator_methods.c b/ext/intl/transliterator/transliterator_methods.c index 239b650a2f0..81e83414a4f 100644 --- a/ext/intl/transliterator/transliterator_methods.c +++ b/ext/intl/transliterator/transliterator_methods.c @@ -13,7 +13,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php_intl.h" diff --git a/ext/json/json.c b/ext/json/json.c index 1ea8eb56f90..6e1c884fbab 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/json/json_encoder.c b/ext/json/json_encoder.c index 75e71b7e278..68418d9e2d6 100644 --- a/ext/json/json_encoder.c +++ b/ext/json/json_encoder.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index f7c405f4835..e15635ffe62 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 1702c8cf9d6..5424a3f3d04 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 95aa156c4f8..757ed79dbca 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/mysqli/mysqli_driver.c b/ext/mysqli/mysqli_driver.c index 60cd94f41c5..b6ee92f4357 100644 --- a/ext/mysqli/mysqli_driver.c +++ b/ext/mysqli/mysqli_driver.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/mysqli/mysqli_exception.c b/ext/mysqli/mysqli_exception.c index 562b454a7be..0c4a8b31dc2 100644 --- a/ext/mysqli/mysqli_exception.c +++ b/ext/mysqli/mysqli_exception.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 1920a454416..5c259cd0fdf 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c index 3ff4fac0ec4..fe44733cd9b 100644 --- a/ext/mysqli/mysqli_prop.c +++ b/ext/mysqli/mysqli_prop.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/mysqli/mysqli_report.c b/ext/mysqli/mysqli_report.c index 7af85742f56..68a7a575847 100644 --- a/ext/mysqli/mysqli_report.c +++ b/ext/mysqli/mysqli_report.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/mysqli/mysqli_result_iterator.c b/ext/mysqli/mysqli_result_iterator.c index 200c80c56fc..3441e47d01a 100644 --- a/ext/mysqli/mysqli_result_iterator.c +++ b/ext/mysqli/mysqli_result_iterator.c @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/mysqli/mysqli_warning.c b/ext/mysqli/mysqli_warning.c index 46eec2c3dff..58fddcb0b34 100644 --- a/ext/mysqli/mysqli_warning.c +++ b/ext/mysqli/mysqli_warning.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c index 4efc6518dc9..c21697828a9 100644 --- a/ext/mysqlnd/php_mysqlnd.c +++ b/ext/mysqlnd/php_mysqlnd.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" #include "mysqlnd.h" diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 6a5ba2dc594..491c3ca35e5 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -19,7 +19,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 0c35c9b5461..4c16279d818 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index c9ea849ab12..eb7ab93815a 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -18,7 +18,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c index b26bde1ff8f..31e15527bd5 100644 --- a/ext/pcntl/pcntl.c +++ b/ext/pcntl/pcntl.c @@ -24,7 +24,7 @@ #endif #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c index 6aa0f1d6f3d..a213fa1c872 100644 --- a/ext/pdo/pdo.c +++ b/ext/pdo/pdo.c @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c index 93e4c0b0a82..cc4977b2c10 100644 --- a/ext/pdo/pdo_dbh.c +++ b/ext/pdo/pdo_dbh.c @@ -19,7 +19,7 @@ /* The PDO Database Handle Class */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/pdo/pdo_sqlstate.c b/ext/pdo/pdo_sqlstate.c index 5858566a818..3085d69192e 100644 --- a/ext/pdo/pdo_sqlstate.c +++ b/ext/pdo/pdo_sqlstate.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c index 3e4e73d8952..084bae8667c 100644 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c @@ -19,7 +19,7 @@ /* The PDO Statement Handle Class */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c index 82df4ae40ff..97d0539f1ed 100644 --- a/ext/pdo_firebird/firebird_driver.c +++ b/ext/pdo_firebird/firebird_driver.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #ifndef _GNU_SOURCE diff --git a/ext/pdo_firebird/firebird_statement.c b/ext/pdo_firebird/firebird_statement.c index 25b965b796d..7cc3236563c 100644 --- a/ext/pdo_firebird/firebird_statement.c +++ b/ext/pdo_firebird/firebird_statement.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/pdo_firebird/pdo_firebird.c b/ext/pdo_firebird/pdo_firebird.c index ce4c6d69102..3e9c8920928 100644 --- a/ext/pdo_firebird/pdo_firebird.c +++ b/ext/pdo_firebird/pdo_firebird.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index 16e3620bb80..f75959fce0c 100644 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c index b4b7c8ecb60..9c28be41e9e 100644 --- a/ext/pdo_mysql/mysql_statement.c +++ b/ext/pdo_mysql/mysql_statement.c @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c index cdf4b03d0f8..24490f3b5a1 100644 --- a/ext/pdo_mysql/pdo_mysql.c +++ b/ext/pdo_mysql/pdo_mysql.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/pdo_odbc/odbc_driver.c b/ext/pdo_odbc/odbc_driver.c index 0e89e2b21d4..1ddce74f3f9 100644 --- a/ext/pdo_odbc/odbc_driver.c +++ b/ext/pdo_odbc/odbc_driver.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/pdo_odbc/odbc_stmt.c b/ext/pdo_odbc/odbc_stmt.c index a4264b73eb7..7550d080249 100644 --- a/ext/pdo_odbc/odbc_stmt.c +++ b/ext/pdo_odbc/odbc_stmt.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/pdo_odbc/pdo_odbc.c b/ext/pdo_odbc/pdo_odbc.c index 40303609b3b..1052322fe8c 100644 --- a/ext/pdo_odbc/pdo_odbc.c +++ b/ext/pdo_odbc/pdo_odbc.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/pdo_pgsql/pdo_pgsql.c b/ext/pdo_pgsql/pdo_pgsql.c index 4c18806da6b..caa2caee54d 100644 --- a/ext/pdo_pgsql/pdo_pgsql.c +++ b/ext/pdo_pgsql/pdo_pgsql.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c index 305e567d70f..f2b59bf25f4 100644 --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/pdo_pgsql/pgsql_statement.c b/ext/pdo_pgsql/pgsql_statement.c index 1b2de962c5a..55759133864 100644 --- a/ext/pdo_pgsql/pgsql_statement.c +++ b/ext/pdo_pgsql/pgsql_statement.c @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/pdo_sqlite/pdo_sqlite.c b/ext/pdo_sqlite/pdo_sqlite.c index 49a477998b0..e2c686ed691 100644 --- a/ext/pdo_sqlite/pdo_sqlite.c +++ b/ext/pdo_sqlite/pdo_sqlite.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c index 8d0c034fee4..3c2b4efde16 100644 --- a/ext/pdo_sqlite/sqlite_driver.c +++ b/ext/pdo_sqlite/sqlite_driver.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/pdo_sqlite/sqlite_statement.c b/ext/pdo_sqlite/sqlite_statement.c index 77bc65a4f09..29309ac5f1f 100644 --- a/ext/pdo_sqlite/sqlite_statement.c +++ b/ext/pdo_sqlite/sqlite_statement.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 2bf8a1f94aa..afaee983c2d 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -23,7 +23,7 @@ #define PHP_PGSQL_PRIVATE 1 #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #define SMART_STR_PREALLOC 512 diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h index dc2b2be1202..625b8f1f16f 100644 --- a/ext/phar/phar_internal.h +++ b/ext/phar/phar_internal.h @@ -18,7 +18,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include diff --git a/ext/posix/php_posix.h b/ext/posix/php_posix.h index e7679dde613..79e6fe83ef9 100644 --- a/ext/posix/php_posix.h +++ b/ext/posix/php_posix.h @@ -18,7 +18,7 @@ #define PHP_POSIX_H #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #ifdef HAVE_POSIX diff --git a/ext/posix/posix.c b/ext/posix/posix.c index 67450315c7d..6711492e3d2 100644 --- a/ext/posix/posix.c +++ b/ext/posix/posix.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/readline/readline.c b/ext/readline/readline.c index bd477fcc89c..aaad1d48723 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -17,7 +17,7 @@ /* {{{ includes & prototypes */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/readline/readline_cli.c b/ext/readline/readline_cli.c index 80ddd88f7d4..312129991c7 100644 --- a/ext/readline/readline_cli.c +++ b/ext/readline/readline_cli.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index f4386babef8..b63e94ebf5e 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -19,7 +19,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/session/session.c b/ext/session/session.c index 1203c3baf16..d35b7dc97ff 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/shmop/shmop.c b/ext/shmop/shmop.c index 7109f218169..13680573098 100644 --- a/ext/shmop/shmop.c +++ b/ext/shmop/shmop.c @@ -18,7 +18,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index 13e92a1f6cf..29026a1bff7 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/skeleton/skeleton.c b/ext/skeleton/skeleton.c index b08c9f09c55..cef92b0ec02 100644 --- a/ext/skeleton/skeleton.c +++ b/ext/skeleton/skeleton.c @@ -1,7 +1,7 @@ %HEADER% #ifdef HAVE_CONFIG_H -# include "config.h" +# include #endif #include "php.h" diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index 0133d8c8f84..62e77979a3a 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/soap/soap.c b/ext/soap/soap.c index a92e1513e27..1be3e60df96 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php_soap.h" #include "ext/session/php_session.h" diff --git a/ext/sockets/multicast.c b/ext/sockets/multicast.c index 6af9a95f615..e258ca3e66e 100644 --- a/ext/sockets/multicast.c +++ b/ext/sockets/multicast.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index 284cc02beaa..0f1d8c53806 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -19,7 +19,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index 391d14c354a..78315e9880b 100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index 2a9070395c9..368b5e5d10d 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/spl/spl_functions.c b/ext/spl/spl_functions.c index 1e9f8f41ba7..e7ecbc33f92 100644 --- a/ext/spl/spl_functions.c +++ b/ext/spl/spl_functions.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H - #include "config.h" + #include #endif #include "php.h" diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index 0f26593b850..4ef8cb3101a 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/sysvmsg/sysvmsg.c b/ext/sysvmsg/sysvmsg.c index d588bf7917a..e9898deb11a 100644 --- a/ext/sysvmsg/sysvmsg.c +++ b/ext/sysvmsg/sysvmsg.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c index 107db3e31ef..481d8ce28cc 100644 --- a/ext/sysvsem/sysvsem.c +++ b/ext/sysvsem/sysvsem.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c index 27d9dd2260a..6cf41caba65 100644 --- a/ext/sysvshm/sysvshm.c +++ b/ext/sysvshm/sysvshm.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index 8fbcaf9aba8..45e8dcc0283 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c index 58594cac307..9d1b19df911 100644 --- a/ext/tokenizer/tokenizer.c +++ b/ext/tokenizer/tokenizer.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/xml/xml.c b/ext/xml/xml.c index f157914e736..ce8572c3240 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c index 4d63f9af8b2..0b3689ccf8f 100644 --- a/ext/xmlreader/php_xmlreader.c +++ b/ext/xmlreader/php_xmlreader.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c index bc4fc2db86d..59a93292629 100644 --- a/ext/xmlwriter/php_xmlwriter.c +++ b/ext/xmlwriter/php_xmlwriter.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif diff --git a/ext/xsl/php_xsl.c b/ext/xsl/php_xsl.c index 86949653da1..c44f1dd4542 100644 --- a/ext/xsl/php_xsl.c +++ b/ext/xsl/php_xsl.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/xsl/xsltprocessor.c b/ext/xsl/xsltprocessor.c index cbbb308927c..ed94d596c82 100644 --- a/ext/xsl/xsltprocessor.c +++ b/ext/xsl/xsltprocessor.c @@ -16,7 +16,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index c72b085573d..4dfaaaee5e1 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -16,7 +16,7 @@ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index e81508bbdc0..3c9f72e82bc 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -19,7 +19,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/main/php_odbc_utils.c b/main/php_odbc_utils.c index f34eb143f63..5cba835f81e 100644 --- a/main/php_odbc_utils.c +++ b/main/php_odbc_utils.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/sapi/cli/php_cli_process_title.c b/sapi/cli/php_cli_process_title.c index 03de2136528..d18af8de686 100644 --- a/sapi/cli/php_cli_process_title.c +++ b/sapi/cli/php_cli_process_title.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "php.h" diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 274d7cd865b..a72acece0e0 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -29,7 +29,7 @@ # include "win32/php_registry.h" # include #else -# include "php_config.h" +# include #endif #ifdef __riscos__ diff --git a/sapi/cli/php_http_parser.h b/sapi/cli/php_http_parser.h index 37538cdeeea..345ca405edd 100644 --- a/sapi/cli/php_http_parser.h +++ b/sapi/cli/php_http_parser.h @@ -31,7 +31,7 @@ extern "C" { # include # include "config.w32.h" #else -# include "php_config.h" +# include #endif #include diff --git a/sapi/cli/ps_title.c b/sapi/cli/ps_title.c index 41226e50264..e44df364ad7 100644 --- a/sapi/cli/ps_title.c +++ b/sapi/cli/ps_title.c @@ -34,7 +34,7 @@ #include #include "win32/codepage.h" #else -#include "php_config.h" +#include extern char** environ; #endif diff --git a/sapi/fuzzer/fuzzer-exif.c b/sapi/fuzzer/fuzzer-exif.c index e35ee9af23e..b3b263dd53a 100644 --- a/sapi/fuzzer/fuzzer-exif.c +++ b/sapi/fuzzer/fuzzer-exif.c @@ -17,7 +17,7 @@ #include "fuzzer.h" #include "Zend/zend.h" -#include "main/php_config.h" +#include
#include "main/php_main.h" #include "ext/standard/php_var.h" diff --git a/sapi/fuzzer/fuzzer-json.c b/sapi/fuzzer/fuzzer-json.c index 4335598bc3c..930f136a472 100644 --- a/sapi/fuzzer/fuzzer-json.c +++ b/sapi/fuzzer/fuzzer-json.c @@ -20,7 +20,7 @@ #include "fuzzer.h" #include "Zend/zend.h" -#include "main/php_config.h" +#include
#include "main/php_main.h" #include diff --git a/sapi/fuzzer/fuzzer-mbregex.c b/sapi/fuzzer/fuzzer-mbregex.c index 970a7b5baee..451b19d99e3 100644 --- a/sapi/fuzzer/fuzzer-mbregex.c +++ b/sapi/fuzzer/fuzzer-mbregex.c @@ -18,7 +18,7 @@ #include "fuzzer.h" #include "Zend/zend.h" -#include "main/php_config.h" +#include
#include "main/php_main.h" #include "oniguruma.h" diff --git a/sapi/fuzzer/fuzzer-unserialize.c b/sapi/fuzzer/fuzzer-unserialize.c index ff26e5b1e8d..023a19fbd08 100644 --- a/sapi/fuzzer/fuzzer-unserialize.c +++ b/sapi/fuzzer/fuzzer-unserialize.c @@ -18,7 +18,7 @@ #include "fuzzer.h" #include "Zend/zend.h" -#include "main/php_config.h" +#include
#include "main/php_main.h" #include diff --git a/sapi/fuzzer/fuzzer-unserializehash.c b/sapi/fuzzer/fuzzer-unserializehash.c index 5d29eb5fb8c..90d874aba88 100644 --- a/sapi/fuzzer/fuzzer-unserializehash.c +++ b/sapi/fuzzer/fuzzer-unserializehash.c @@ -16,7 +16,7 @@ #include "fuzzer.h" #include "Zend/zend.h" -#include "main/php_config.h" +#include
#include "main/php_main.h" #include diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h index 3e6caa21fd3..00ef66c2e7c 100644 --- a/sapi/phpdbg/phpdbg.h +++ b/sapi/phpdbg/phpdbg.h @@ -56,7 +56,7 @@ # define strcasecmp _stricmp # define strncasecmp _strnicmp #else -# include "php_config.h" +# include #endif #ifndef O_BINARY # define O_BINARY 0 diff --git a/sapi/phpdbg/phpdbg_io.c b/sapi/phpdbg/phpdbg_io.c index 14ae71a0ebd..261a67cd392 100644 --- a/sapi/phpdbg/phpdbg_io.c +++ b/sapi/phpdbg/phpdbg_io.c @@ -15,7 +15,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif #include "phpdbg_io.h"