From 809920b8cb130e105847a9956c51a6ecb08e2938 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Sat, 23 Feb 2019 19:36:24 +0100 Subject: Try to unify the includes --- src/php_snuffleupagus.h | 20 ++++++++++++++++++-- src/snuffleupagus.c | 1 - src/sp_config.c | 3 --- src/sp_config_keywords.c | 1 - src/sp_cookie_encryption.c | 2 -- src/sp_crypt.c | 2 -- src/sp_disabled_functions.c | 2 -- src/sp_execute.c | 3 --- src/sp_list.c | 3 --- src/sp_network_utils.c | 4 ---- src/sp_pcre_compat.c | 2 -- src/sp_session.c | 1 - src/sp_sloppy.c | 1 - src/sp_upload_validation.c | 1 - src/sp_utils.c | 6 ------ src/sp_wrapper.c | 1 - 16 files changed, 18 insertions(+), 35 deletions(-) (limited to 'src') diff --git a/src/php_snuffleupagus.h b/src/php_snuffleupagus.h index e7b5dc1..9da93ce 100644 --- a/src/php_snuffleupagus.h +++ b/src/php_snuffleupagus.h @@ -7,23 +7,39 @@ #define PHP_SNUFFLEUPAGUS_URL "https://github.com/nbs-system/snuffleupagus" #define PHP_SNUFFLEUPAGUS_COPYRIGHT "LGPLv2" +#include +#include +#include +#include #include #include +#include +#include +#include -#include +#include +#include +#include #include #include #include "SAPI.h" +#include "ext/session/php_session.h" +#include "ext/standard/head.h" #include "ext/standard/info.h" +#include "ext/standard/url.h" #include "ext/standard/php_var.h" #include "ext/pcre/php_pcre.h" #include "ext/session/php_session.h" #include "php.h" #include "php_ini.h" +#include "rfc1867.h" +#include "zend_execute.h" +#include "zend_extensions.h" #include "zend_hash.h" #include "zend_string.h" -#include "zend_extensions.h" +#include "zend_types.h" +#include "zend_vm.h" /* Compatibility */ #if ( !HAVE_PCRE && !HAVE_BUNDLED_PCRE ) diff --git a/src/snuffleupagus.c b/src/snuffleupagus.c index 2b30502..ff2d2b6 100644 --- a/src/snuffleupagus.c +++ b/src/snuffleupagus.c @@ -9,7 +9,6 @@ #endif #include "php_snuffleupagus.h" -#include "sp_config.h" #ifndef ZEND_EXT_API #define ZEND_EXT_API ZEND_DLEXPORT diff --git a/src/sp_config.c b/src/sp_config.c index debf749..915c8a1 100644 --- a/src/sp_config.c +++ b/src/sp_config.c @@ -1,9 +1,6 @@ -#include #if defined(__FreeBSD__) #define _WITH_GETLINE #endif -#include -#include #include "php_snuffleupagus.h" diff --git a/src/sp_config_keywords.c b/src/sp_config_keywords.c index a9c71d4..a13aed2 100644 --- a/src/sp_config_keywords.c +++ b/src/sp_config_keywords.c @@ -1,5 +1,4 @@ #include "php_snuffleupagus.h" -#include "zend_types.h" ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus) diff --git a/src/sp_cookie_encryption.c b/src/sp_cookie_encryption.c index 4e5242d..9c034da 100644 --- a/src/sp_cookie_encryption.c +++ b/src/sp_cookie_encryption.c @@ -1,7 +1,5 @@ #include "php_snuffleupagus.h" -#include "ext/standard/url.h" -#include "ext/standard/head.h" ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus) diff --git a/src/sp_crypt.c b/src/sp_crypt.c index bfb622a..da0e2fe 100644 --- a/src/sp_crypt.c +++ b/src/sp_crypt.c @@ -1,7 +1,5 @@ #include "php_snuffleupagus.h" -#include "ext/standard/url.h" - ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus) void generate_key(unsigned char *key) { diff --git a/src/sp_disabled_functions.c b/src/sp_disabled_functions.c index 0f42f8f..030fbd8 100644 --- a/src/sp_disabled_functions.c +++ b/src/sp_disabled_functions.c @@ -1,7 +1,5 @@ #include "php_snuffleupagus.h" -#include "zend_execute.h" -#include "zend_hash.h" ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus) diff --git a/src/sp_execute.c b/src/sp_execute.c index 544d8c2..b4f2595 100644 --- a/src/sp_execute.c +++ b/src/sp_execute.c @@ -1,7 +1,4 @@ #include "php_snuffleupagus.h" -#include "zend_vm.h" -#include -#include ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus) diff --git a/src/sp_list.c b/src/sp_list.c index 8879d89..c798d6d 100644 --- a/src/sp_list.c +++ b/src/sp_list.c @@ -1,6 +1,3 @@ -#include "sp_list.h" -#include -#include #include "php_snuffleupagus.h" void sp_list_free(sp_list_node *node) { diff --git a/src/sp_network_utils.c b/src/sp_network_utils.c index 51911a8..c444c1e 100644 --- a/src/sp_network_utils.c +++ b/src/sp_network_utils.c @@ -1,7 +1,3 @@ -#include -#include -#include - #include "php_snuffleupagus.h" ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus) diff --git a/src/sp_pcre_compat.c b/src/sp_pcre_compat.c index 233ddc0..3f8ff1e 100644 --- a/src/sp_pcre_compat.c +++ b/src/sp_pcre_compat.c @@ -1,7 +1,5 @@ #include "php_snuffleupagus.h" -#include "sp_pcre_compat.h" - sp_pcre* sp_pcre_compile(const char* const pattern) { sp_pcre* ret = NULL; #ifdef SP_HAS_PCRE2 diff --git a/src/sp_session.c b/src/sp_session.c index 0f45f9b..596eae9 100644 --- a/src/sp_session.c +++ b/src/sp_session.c @@ -1,5 +1,4 @@ #include "php_snuffleupagus.h" -#include "ext/session/php_session.h" ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus) diff --git a/src/sp_sloppy.c b/src/sp_sloppy.c index 8c36822..d3678db 100644 --- a/src/sp_sloppy.c +++ b/src/sp_sloppy.c @@ -1,5 +1,4 @@ #include "php_snuffleupagus.h" -#include "sp_sloppy.h" ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus) diff --git a/src/sp_upload_validation.c b/src/sp_upload_validation.c index 8dcc485..fe16a46 100644 --- a/src/sp_upload_validation.c +++ b/src/sp_upload_validation.c @@ -1,5 +1,4 @@ #include "php_snuffleupagus.h" -#include "rfc1867.h" ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus) diff --git a/src/sp_utils.c b/src/sp_utils.c index 1231bee..ea6afaf 100644 --- a/src/sp_utils.c +++ b/src/sp_utils.c @@ -1,11 +1,5 @@ #include "php_snuffleupagus.h" -#include -#include -#include -#include -#include -#include ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus) diff --git a/src/sp_wrapper.c b/src/sp_wrapper.c index fd47dd6..1618a4f 100644 --- a/src/sp_wrapper.c +++ b/src/sp_wrapper.c @@ -1,5 +1,4 @@ #include "php_snuffleupagus.h" -#include "sp_config.h" ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus) -- cgit v1.3