From 7f8dcffc0ce08664b43a64839cad5507ea7f8eab Mon Sep 17 00:00:00 2001 From: Pawel Chojnacki Date: Fri, 19 Oct 2018 11:12:56 +0200 Subject: [PATCH] Standardize import paths --- src/ext/ddtrace.c | 2 +- src/ext/dispatch.c | 11 +++++------ src/ext/dispatch_setup.c | 11 +++++------ 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/ext/ddtrace.c b/src/ext/ddtrace.c index a178b06c21..dd9abd8353 100644 --- a/src/ext/ddtrace.c +++ b/src/ext/ddtrace.c @@ -4,8 +4,8 @@ #include #include #include -#include #include +#include #include #include "compat_zend_string.h" diff --git a/src/ext/dispatch.c b/src/ext/dispatch.c index 09c1e5034b..3bd3f4e563 100644 --- a/src/ext/dispatch.c +++ b/src/ext/dispatch.c @@ -1,16 +1,15 @@ -#include "php.h" -#include "php/ext/spl/spl_exceptions.h" +#include +#include #include "ddtrace.h" #include "dispatch.h" -#include "php/ext/spl/spl_exceptions.h" -#include "Zend/zend.h" +#include #include "compat_zend_string.h" #include "dispatch_compat.h" -#include "Zend/zend_closures.h" -#include "Zend/zend_exceptions.h" +#include +#include #include "debug.h" #define BUSY_FLAG 1 diff --git a/src/ext/dispatch_setup.c b/src/ext/dispatch_setup.c index 304ee10d3e..c4a16f86d3 100644 --- a/src/ext/dispatch_setup.c +++ b/src/ext/dispatch_setup.c @@ -1,17 +1,16 @@ -#include "php.h" -#include "php/ext/spl/spl_exceptions.h" +#include +#include #include "ddtrace.h" #include "debug.h" #include "dispatch.h" -#include "php/ext/spl/spl_exceptions.h" -#include "Zend/zend.h" +#include #include "compat_zend_string.h" #include "dispatch_compat.h" -#include "Zend/zend_closures.h" -#include "Zend/zend_exceptions.h" +#include +#include ZEND_EXTERN_MODULE_GLOBALS(ddtrace); user_opcode_handler_t ddtrace_old_fcall_handler;