blob: 57f38f4fc7ea87439afec929b3ff8e5243d73315 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
From b34d134a63e6f784d90fe5fbc455cf383f0e8c82 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 4 Sep 2020 08:36:10 +0200
Subject: [PATCH] SPL is always there
---
imagick.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/imagick.c b/imagick.c
index 1e6d174..cd7f98e 100644
--- a/imagick.c
+++ b/imagick.c
@@ -33,9 +33,7 @@
/* For the countable interface */
-#if defined(HAVE_SPL)
#include "ext/spl/spl_iterators.h"
-#endif
ZEND_DECLARE_MODULE_GLOBALS(imagick)
@@ -3799,11 +3797,7 @@ PHP_MINIT_FUNCTION(imagick)
#endif
php_imagick_sc_entry = zend_register_internal_class(&ce TSRMLS_CC);
-#if defined(HAVE_SPL)
zend_class_implements(php_imagick_sc_entry TSRMLS_CC, 2, zend_ce_iterator, spl_ce_Countable);
-#else
- zend_class_implements(php_imagick_sc_entry TSRMLS_CC, 1, zend_ce_iterator);
-#endif
/*
Initialize the class (ImagickDraw)
@@ -4011,9 +4005,7 @@ PHP_RSHUTDOWN_FUNCTION(imagick)
static const zend_module_dep imagick_deps[] = {
ZEND_MOD_CONFLICTS("gmagick")
ZEND_MOD_REQUIRED("standard")
-#ifdef HAVE_SPL
ZEND_MOD_REQUIRED("spl")
-#endif
ZEND_MOD_END
};
#endif
|
