Skip to content

Commit e93d23a

Browse files
authored
Remove unused ext/spl SPL_API code (#13985)
The ext/spl is always enabled and building it as shared is no longer relevant.
1 parent 8160869 commit e93d23a

File tree

3 files changed

+0
-27
lines changed

3 files changed

+0
-27
lines changed

ext/spl/php_spl.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@
3838
#include "zend_interfaces.h"
3939
#include "main/snprintf.h"
4040

41-
#ifdef COMPILE_DL_SPL
42-
ZEND_GET_MODULE(spl)
43-
#endif
44-
4541
ZEND_TLS zend_string *spl_autoload_extensions;
4642
ZEND_TLS HashTable *spl_autoload_functions;
4743

ext/spl/php_spl.h

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,6 @@
2525
extern zend_module_entry spl_module_entry;
2626
#define phpext_spl_ptr &spl_module_entry
2727

28-
#ifdef PHP_WIN32
29-
# ifdef SPL_EXPORTS
30-
# define SPL_API __declspec(dllexport)
31-
# elif defined(COMPILE_DL_SPL)
32-
# define SPL_API __declspec(dllimport)
33-
# else
34-
# define SPL_API /* nothing */
35-
# endif
36-
#elif defined(__GNUC__) && __GNUC__ >= 4
37-
# define SPL_API __attribute__ ((visibility("default")))
38-
#else
39-
# define SPL_API
40-
#endif
41-
42-
#if defined(PHP_WIN32) && !defined(COMPILE_DL_SPL)
43-
#undef phpext_spl
44-
#define phpext_spl NULL
45-
#endif
46-
4728
PHP_MINIT_FUNCTION(spl);
4829
PHP_MSHUTDOWN_FUNCTION(spl);
4930
PHP_RINIT_FUNCTION(spl);

ext/spl/spl_fixedarray.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@
3636
static zend_object_handlers spl_handler_SplFixedArray;
3737
PHPAPI zend_class_entry *spl_ce_SplFixedArray;
3838

39-
#ifdef COMPILE_DL_SPL_FIXEDARRAY
40-
ZEND_GET_MODULE(spl_fixedarray)
41-
#endif
42-
4339
/* Check if the object is an instance of a subclass of SplFixedArray that overrides method's implementation.
4440
* Expect subclassing SplFixedArray to be rare and check that first. */
4541
#define HAS_FIXEDARRAY_ARRAYACCESS_OVERRIDE(object, method) UNEXPECTED((object)->ce != spl_ce_SplFixedArray && (object)->ce->arrayaccess_funcs_ptr->method->common.scope != spl_ce_SplFixedArray)

0 commit comments

Comments
 (0)