From 04c417a35e87a7cbfe5a9c305d401daf7425e5db Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sat, 4 May 2024 21:06:29 +0200 Subject: [PATCH] Remove unused always-enabled extension headers (#14042) These were once used in these files but at this point aren't and are only causing confusion whether file depends on additional extension. - locale.h is added in main/SAPI.c for _ENABLE_PER_THREAD_LOCALE --- ext/hash/hash.c | 1 - ext/standard/array.c | 1 - ext/standard/browscap.c | 1 - main/SAPI.c | 2 +- 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ext/hash/hash.c b/ext/hash/hash.c index e0024daf90d..b75c21cfcd0 100644 --- a/ext/hash/hash.c +++ b/ext/hash/hash.c @@ -24,7 +24,6 @@ #include "ext/standard/info.h" #include "ext/standard/file.h" #include "ext/standard/php_var.h" -#include "ext/spl/spl_exceptions.h" #include "zend_attributes.h" #include "zend_exceptions.h" diff --git a/ext/standard/array.c b/ext/standard/array.c index 95768bf90aa..d93ac630c37 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -40,7 +40,6 @@ #include "zend_smart_str.h" #include "zend_bitset.h" #include "zend_exceptions.h" -#include "ext/spl/spl_array.h" #include "ext/random/php_random.h" #include "zend_frameless_function.h" diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c index 31e5c574356..69ef1f3dffd 100644 --- a/ext/standard/browscap.c +++ b/ext/standard/browscap.c @@ -18,7 +18,6 @@ #include "php_browscap.h" #include "php_ini.h" #include "php_string.h" -#include "ext/pcre/php_pcre.h" #include "zend_ini_scanner.h" #include "zend_globals.h" diff --git a/main/SAPI.c b/main/SAPI.c index e30a04144db..f9d8693a2bc 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -18,6 +18,7 @@ #include #include +#include #include "php.h" #include "SAPI.h" @@ -25,7 +26,6 @@ #include "php_ini.h" #include "ext/standard/php_string.h" #include "ext/standard/pageinfo.h" -#include "ext/pcre/php_pcre.h" #ifdef ZTS #include "TSRM.h" #endif