From 24a390ad3513bd5171b1dbdf57edc91152ad8d45 Mon Sep 17 00:00:00 2001 From: Arnaud Le Blanc Date: Mon, 26 Feb 2024 14:28:16 +0100 Subject: [PATCH 1/5] 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 --- build/Makefile.global | 3 +-- configure.ac | 7 +++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build/Makefile.global b/build/Makefile.global index 714940159638c..38e71edfb5f7b 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 = $(CORE_INCLUDES) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH) all: $(all_targets) @echo diff --git a/configure.ac b/configure.ac index 564f9c90c2c77..d0a22b67be49b 100644 --- a/configure.ac +++ b/configure.ac @@ -1351,12 +1351,14 @@ LIBZEND_BASIC_CHECKS LIBZEND_DLSYM_CHECK LIBZEND_OTHER_CHECKS +CORE_INCLUDES="$CORE_INCLUDES -I\$(top_builddir)/main -I\$(top_builddir)" 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)/" + CORE_INCLUDES="$CORE_INCLUDES -I\$(top_srcdir)/main -I\$(top_srcdir)" + INCLUDES="$INCLUDES -I\$(top_srcdir)/Zend" + INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM" fi ZEND_EXTRA_LIBS="$LIBS" @@ -1542,6 +1544,7 @@ PHP_SUBST_OLD(EXTRA_LDFLAGS) PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM) PHP_SUBST_OLD(EXTRA_LIBS) PHP_SUBST_OLD(ZEND_EXTRA_LIBS) +PHP_SUBST_OLD(CORE_INCLUDES) PHP_SUBST_OLD(INCLUDES) PHP_SUBST_OLD(EXTRA_INCLUDES) PHP_SUBST_OLD(INSTALL_IT) From bbd371aa618e92021da9b21c41a6edd0f0badfcb Mon Sep 17 00:00:00 2001 From: Arnaud Le Blanc Date: Tue, 27 Feb 2024 14:00:18 +0100 Subject: [PATCH 2/5] Fix extension include path for out of tree builds --- build/php.m4 | 6 ++++-- ext/skeleton/skeleton.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build/php.m4 b/build/php.m4 index 8be1d81b5beaf..7af7d857cb6a2 100644 --- a/build/php.m4 +++ b/build/php.m4 @@ -213,11 +213,13 @@ dnl from the sources. Should not be used directly. dnl AC_DEFUN([PHP_ADD_SOURCES_X],[ dnl Relative to source- or build-directory? +dnl source-path is "" when called from PHP_NEW_EXTENSION() for extensions built +dnl with phpize, or a relative path when built in php-src. dnl ac_srcdir/ac_bdir include trailing slash case $1 in - ""[)] ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; + ""[)] ac_srcdir="$abs_srcdir/"; ac_bdir="$abs_builddir/"; ac_inc="-I$ac_bdir -I. -I$abs_srcdir" ;; /*[)] ac_srcdir=`echo "$1"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *[)] ac_srcdir="$abs_srcdir/$1/"; ac_bdir="$1/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + *[)] ac_srcdir="$abs_srcdir/$1/"; ac_bdir="$abs_builddir/$1/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac dnl how to build .. shared or static? diff --git a/ext/skeleton/skeleton.c b/ext/skeleton/skeleton.c index b08c9f09c55f7..cef92b0ec02d9 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" From ab2863212781cbb7732363c928b4c2da81ede053 Mon Sep 17 00:00:00 2001 From: Arnaud Le Blanc Date: Tue, 5 Mar 2024 14:48:10 +0100 Subject: [PATCH 3/5] Revert unnecessary php.m4 change --- build/php.m4 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build/php.m4 b/build/php.m4 index 7af7d857cb6a2..8be1d81b5beaf 100644 --- a/build/php.m4 +++ b/build/php.m4 @@ -213,13 +213,11 @@ dnl from the sources. Should not be used directly. dnl AC_DEFUN([PHP_ADD_SOURCES_X],[ dnl Relative to source- or build-directory? -dnl source-path is "" when called from PHP_NEW_EXTENSION() for extensions built -dnl with phpize, or a relative path when built in php-src. dnl ac_srcdir/ac_bdir include trailing slash case $1 in - ""[)] ac_srcdir="$abs_srcdir/"; ac_bdir="$abs_builddir/"; ac_inc="-I$ac_bdir -I. -I$abs_srcdir" ;; + ""[)] ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; /*[)] ac_srcdir=`echo "$1"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; - *[)] ac_srcdir="$abs_srcdir/$1/"; ac_bdir="$abs_builddir/$1/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; + *[)] ac_srcdir="$abs_srcdir/$1/"; ac_bdir="$1/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; esac dnl how to build .. shared or static? From dada90e628b8ab5fa56796e1239b25b57a916c7d Mon Sep 17 00:00:00 2001 From: Arnaud Le Blanc Date: Tue, 5 Mar 2024 17:49:02 +0100 Subject: [PATCH 4/5] Remove CORE_INCLUDES and use exclusively INCLUDES --- build/Makefile.global | 2 +- configure.ac | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/build/Makefile.global b/build/Makefile.global index 38e71edfb5f7b..e0d05f10612b6 100644 --- a/build/Makefile.global +++ b/build/Makefile.global @@ -2,7 +2,7 @@ mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p INSTALL = $(top_srcdir)/build/shtool install -c INSTALL_DATA = $(INSTALL) -m 644 -COMMON_FLAGS = $(CORE_INCLUDES) $(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 d0a22b67be49b..21c96140f27e6 100644 --- a/configure.ac +++ b/configure.ac @@ -1351,15 +1351,14 @@ LIBZEND_BASIC_CHECKS LIBZEND_DLSYM_CHECK LIBZEND_OTHER_CHECKS -CORE_INCLUDES="$CORE_INCLUDES -I\$(top_builddir)/main -I\$(top_builddir)" -INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM" -INCLUDES="$INCLUDES -I\$(top_builddir)/Zend" - -if test "$abs_srcdir" != "$abs_builddir"; then - CORE_INCLUDES="$CORE_INCLUDES -I\$(top_srcdir)/main -I\$(top_srcdir)" - INCLUDES="$INCLUDES -I\$(top_srcdir)/Zend" - INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM" -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 @@ -1544,7 +1543,6 @@ PHP_SUBST_OLD(EXTRA_LDFLAGS) PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM) PHP_SUBST_OLD(EXTRA_LIBS) PHP_SUBST_OLD(ZEND_EXTRA_LIBS) -PHP_SUBST_OLD(CORE_INCLUDES) PHP_SUBST_OLD(INCLUDES) PHP_SUBST_OLD(EXTRA_INCLUDES) PHP_SUBST_OLD(INSTALL_IT) From 4adb2aee305c6924aa299efa455f466dbdd1e889 Mon Sep 17 00:00:00 2001 From: Arnaud Le Blanc Date: Tue, 5 Mar 2024 17:51:42 +0100 Subject: [PATCH 5/5] 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 ++-- 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/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 +- 190 files changed, 192 insertions(+), 192 deletions(-) diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h index c9e8edd37224b..870fd6091e266 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/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c index f53032fabc35c..979d211f8ae3c 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 7f546f95cd0eb..3d85c767ced66 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 9b3480b4a5ca9..bdeb280bfa690 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 756ce0e90dc98..f9212f621f7ea 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 e42f30002093c..ccd7237103d6f 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 67c4fe92102b3..dbea50aaa7dec 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 6714db4e5236f..bd9f981be13ec 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 1965153f027f5..a5c68bb7b9987 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 9aaf5e96ab474..931e4a9afdd08 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 39d245b7d01a7..3c85fc4ce5e4a 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 560524e45d1d4..d04f8b18c6236 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 ececdd87aaba8..17a8a65532bc6 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 83c37964a9f4f..c68001b1b311f 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 ccdcc3ff7e8c8..f5094942914f7 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 14580ef6a8a7c..5b4d7401043b8 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 a2bb419340e86..621bce4202bbb 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 21ea526d8de5f..1b48bfc4c3778 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 60481947dddea..8ffac949e8373 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 a61066b5a6c7c..85efc3b113be9 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 f30790250e0ca..406982d203275 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 0b847ed66de88..a5027919733b6 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 d5af1b8cce249..bd1a247d1dcf9 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 57dfab38f13b7..e4b83fcb55f30 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 86306bd59a2b8..5ec3df182e84a 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 5d36d86e00808..8efc8d45b3ba0 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 a2dbd5dafa1e2..f64db5540ee93 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 88a8959082709..68118e08a0a3f 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 9d5b31128c076..997e6b9cc1126 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 0781e1fb1a76f..245c79e0e62db 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 fe0adbccbfe9c..00b99d55b0056 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 f147f4c810dee..f6bdc7838a6a2 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 758fcd1e77172..40ae304cb7d26 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 d70885754bedd..5cbfeee874d53 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 b085558a71133..6f4cb01e69e53 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 cb1129c3940f0..a0b8837c277ab 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 08d4937341d18..380ceb3db9365 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 36298f526830f..545233bc790e1 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 16a52a5a4e24c..f3004093c203e 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 6268f9b687594..4fb9c62093227 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 e3d9db7238105..9fdc8fc0a4522 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 5e23d57be8ab3..2ae6ecb5d3ec5 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 bb151c198953c..6e1b518d9c816 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 03b94b630f18e..50ad04a0579fa 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 d771eccad8684..9dbe9f455cff9 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 5061af68e272a..b941ff4d8038d 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 828027c9673b6..a0a0613c82695 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 61f0b92eedc22..9888906dfd5ac 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 6a262318a89eb..a54adbbac7388 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 f61254257abb5..1a228baed0574 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 f684f449f6f65..6a18adb8da28b 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 32d10a1bc0dee..6053e82018037 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 efd51cd6545d6..5c48a7ab3621b 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 dfa5b825983c0..d262c98bd1794 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 b74a23ee7228b..d5470108d4c98 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 31631f7b96181..c1e4422a7c769 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 9298c57553827..e495b3d2acd19 100644 --- a/ext/dom/parentnode.c +++ b/ext/dom/parentnode.c @@ -17,7 +17,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 1c7e2691742fd..acc01b65a4ec4 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 d35beba564d9b..7c2626a3a1513 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 1f2a6443ff40e..e8f4b36c0b80b 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 3e50f3caa19a5..622713641b92f 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 5a84fb5d8688b..f6b20e11ae90a 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 474972a5db24d..9427fa9faa93e 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 5c209705d776b..4078a8b1c2390 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 aa83fd969ef42..7bcd2965baf71 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 c3047233dbbe2..8680722ae9541 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 b787ef706c4f2..b64597e1ad0a0 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 5c3c4b301c598..7b764a5fe93f1 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 8c6c2e900177c..4f11b7b6e08bf 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 8b8d6cfd848d8..1888d57d0d9d5 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 51692c47a4e3f..2b9e85eccfe30 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 7c9e8897e7b65..8ea0281611980 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 ae9c9b9e5e060..efb2f8135ab0e 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 c37fdb136d023..d67fdd5c62236 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 e0024daf90d77..b2334004ce79d 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 75f78dd174238..74613d947f2eb 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 be95b1909b35a..f16ae0cc5285d 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 6576398de5201..f71d57f74f86a 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 acf2b2f7d41fe..463348f2a196b 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 5fc4293e9773b..13c33a64bf88b 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 cc9498db1b626..2189b312d7c29 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 e2c9e254f3840..e1cdcdf2a6091 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 0634e68fc7a36..c28ffb82cf737 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 1e2c3d9527bbc..2822177cdfcdb 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 f04020a3de8b7..f9fb27b82a7d0 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 df4a886074463..e6ebd5b789649 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 ed760e232044d..8032d758a939b 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 697d10e5ff06d..9c12af6fb6059 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 9419469b4f609..0d01323353026 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 69aeff886d3b9..098861c16e64e 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 fe50f716e81bb..874984f5405f0 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 962148db348cc..57dbc8bde6b5e 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 1c9d5b5bd9103..216cf7c2c3ebc 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 53c5a3e9be2ab..775f7b5f80b08 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 8ea066c586c1f..92c36c4737ab8 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 a9cfd3d2ea6e5..d7b4276e29fd6 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 89aaf0e97a008..62ed2dbebff09 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 257e0a00ca109..67755a4bb86e1 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 bb6d236fdfcfc..3514b81ffe7a6 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 857cab2624139..a1c3a9efb2d4b 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 cb7afabe2b700..76b269ca85e33 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 d6053b6be56d3..8e1f7298288fb 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 c363dd9706fb2..b7a3e596d3eaa 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 12df37417428d..b56bf360d114d 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 6b20c238fe3f6..5d170d25945fa 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 f6ec60fe19942..46a364c5d3a21 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 baa6dfcce74b0..8d1083fa59413 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 ee7b787b9ee39..79923b8d63f9f 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 7827774d9b487..eee9e77c19d78 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 54470808c93c4..cc61201830b77 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 3831b9403ea48..cc803e481047c 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 0a84d40079a42..557e325215111 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 31ed76703ec12..60c14a5f862f9 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 4709c0e2be4a7..c80794ab6768d 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 01d40b06a2778..fa2d521f14610 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 f98ab2fc15f46..20abd5f87a47b 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 68b55e1d78d35..5eb8b6305ac76 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 d5b831381b03b..4ede21fc74bec 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 3d15881863e24..b770bd91ac12f 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 406d928699784..522412bb7d467 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 279a93b3d3992..2d066c416c430 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 b757f6f54fcc9..f65ed3bbe4170 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 c781fcae9de8e..4d88ec371bfe2 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 bcd4786c38711..51fbf4c8418be 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 4efc6518dc93f..c21697828a9a7 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 1866a8f14d12d..55bf5c46f5c8d 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 1506e6fef45dc..9df99a8f41763 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 fc3f294c36712..97e25656d0846 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 c3139bfd86981..8520a059eedd9 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 6aa0f1d6f3dfc..a213fa1c87271 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 f74f92c221d03..c5deb0f881c3e 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 5858566a818eb..3085d69192e3b 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 be5e287111f32..b27a2dccab432 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 d8832303272f4..cb7d9927ff7f7 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 0b825df6bf210..26c73cf466856 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 99fe6b57a1002..64f0cee40363d 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 4d87d9954749b..1aa5224bec166 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 e3127f95d69db..ae0647711d459 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 291b60c59daba..3d93fd54b9039 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 9e5c6eb7d5431..eabfcbb9c6e04 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 ea0dd0e53aac6..000a2303f73f0 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 b7081d5b693a1..2e06770ddf417 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 a38f87896e62a..e2414bebae596 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 525f9cd1c15f7..b844bf3dc5869 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 15ecd8ce6f562..5cfe829a1a132 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 55bfc621291ee..44cef9d35250c 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 7cd8880b86099..16e51bd846abf 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 c6b907f6fc22f..822394fdebf02 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 860d007cfc01d..97e59ab0c086a 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 9f8a46b65ec60..0ef37bc866dab 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 e7679dde6130b..79e6fe83ef9ec 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 aa17cc95d8046..ffe2e06da78ed 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 db2776fb27a9a..5e099e53744af 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 4afe7be3f667c..9949e9b708903 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 28a897ba89fce..d7f0a2766923a 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 ba4bb6619766c..93ec5d9790f06 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 be4f57ad27162..be0c953861bbc 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 a66b31a499b99..ce01688ae32aa 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/snmp/snmp.c b/ext/snmp/snmp.c index 30c629217d940..83f9ecae34df9 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 9064d1cbacef0..66af9982f1449 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" #if defined(HAVE_PHP_SESSION) && !defined(COMPILE_DL_SESSION) diff --git a/ext/sockets/multicast.c b/ext/sockets/multicast.c index 1cfdf1e18d481..315889e06846b 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 7413343433849..7c6728d0839b0 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 f3f2c7c50a41e..45a722301c720 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 1d0381380898d..ef01288eaa718 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 0fcf389667355..1a9649688677a 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 cad3796ffdbf7..146999dc7e1ae 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 20bdecedb50c3..9e0a904f1fea3 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 107db3e31efb8..481d8ce28cc36 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 bec3af680e0d1..d9f6204f35de0 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 a2e4dec90a3e1..d537fdc8bf9c4 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 75cc99d7b84c6..c51fe354a9467 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 f6b4d8c5008ed..f7009ad84692d 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 f56707c0e7f0c..b804d89b20958 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 abb135780887b..84ccf89300a74 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 2699ec2779dd2..d5a632f9dfa45 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 ce07e75748eb0..8df746b884232 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 0c1dfaf5dd131..fb21050ccba0b 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 8b593f1f451b0..b4726caebc92c 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 f34eb143f63a5..5cba835f81e34 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 03de2136528b7..d18af8de68671 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 e84defb3da469..de6aa97a09b36 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 37538cdeeea15..345ca405edd0d 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 21a9f38e33dd0..18d105fcd97eb 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 cb16bb90233a0..41e568c37ad23 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 4335598bc3caa..930f136a47236 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 970a7b5baeedb..451b19d99e310 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 ff26e5b1e8da3..023a19fbd08d3 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 5d29eb5fb8c61..90d874aba88cc 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 3e6caa21fd3b6..00ef66c2e7ca9 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 14ae71a0ebd1b..261a67cd39253 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"