From 2b3ab9da097a07825e7f36ee400fa28b8d3ce8e1 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Thu, 27 Jun 2019 00:33:27 +0200 Subject: [PATCH] Remove HAVE_SPL The HAVE_SPL symbol is defined in PHP to indicate the presence of the spl extension. Since PHP 5.3 the spl extension is always availabe and since PHP-7.4 the HAVE_SPL symbol has also been removed. --- uopz.c | 6 ------ uopz.h | 7 +------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/uopz.c b/uopz.c index 2f8c193..68b31e6 100644 --- a/uopz.c +++ b/uopz.c @@ -24,12 +24,6 @@ #include "php_ini.h" #include "ext/standard/info.h" -#ifndef HAVE_SPL -/* {{{ */ -zend_class_entry *spl_ce_RuntimeException; -zend_class_entry *spl_ce_InvalidArgumentException; /* }}} */ -#endif - #include "uopz.h" #include "src/util.h" diff --git a/uopz.h b/uopz.h index 3ac5bcb..e543554 100644 --- a/uopz.h +++ b/uopz.h @@ -44,12 +44,7 @@ ZEND_END_MODULE_GLOBALS(uopz) #define UOPZ(v) (uopz_globals.v) #endif -#ifdef HAVE_SPL -# include "ext/spl/spl_exceptions.h" -#else - extern zend_class_entry* spl_ce_RuntimeException; -#endif - +#include "ext/spl/spl_exceptions.h" #include "Zend/zend_inheritance.h" #include "Zend/zend_exceptions.h" #include "Zend/zend_closures.h"