diff options
author | Etienne Kneuss <colder@php.net> | 2008-11-06 00:37:13 +0000 |
---|---|---|
committer | Etienne Kneuss <colder@php.net> | 2008-11-06 00:37:13 +0000 |
commit | 27e41ff48cb942bd8102967b5d59080acaa6a161 (patch) | |
tree | 3bf085e8845b419392e6e0478c41b3dfc47fe23c /ext/spl/php_spl.c | |
parent | a912d80adbeee5526b7748c154c18953daf4d88f (diff) | |
download | php-git-27e41ff48cb942bd8102967b5d59080acaa6a161.tar.gz |
MFH: Fix #45976 (Move SXE from SPL to SimpleXML)
Diffstat (limited to 'ext/spl/php_spl.c')
-rwxr-xr-x | ext/spl/php_spl.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index 22a264bde7..8039ed1a47 100755 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -32,7 +32,6 @@ #include "spl_array.h" #include "spl_directory.h" #include "spl_iterators.h" -#include "spl_sxe.h" #include "spl_exceptions.h" #include "spl_observer.h" #include "spl_dllist.h" @@ -191,7 +190,6 @@ PHP_FUNCTION(class_implements) SPL_ADD_CLASS(RegexIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(RuntimeException, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(SeekableIterator, z_list, sub, allow, ce_flags); \ - SPL_ADD_CLASS(SimpleXMLIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(SplDoublyLinkedList, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(SplFileInfo, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(SplFileObject, z_list, sub, allow, ce_flags); \ @@ -844,7 +842,6 @@ PHP_MINIT_FUNCTION(spl) PHP_MINIT(spl_iterators)(INIT_FUNC_ARGS_PASSTHRU); PHP_MINIT(spl_array)(INIT_FUNC_ARGS_PASSTHRU); PHP_MINIT(spl_directory)(INIT_FUNC_ARGS_PASSTHRU); - PHP_MINIT(spl_sxe)(INIT_FUNC_ARGS_PASSTHRU); PHP_MINIT(spl_dllist)(INIT_FUNC_ARGS_PASSTHRU); PHP_MINIT(spl_heap)(INIT_FUNC_ARGS_PASSTHRU); PHP_MINIT(spl_fixedarray)(INIT_FUNC_ARGS_PASSTHRU); @@ -877,23 +874,10 @@ PHP_RSHUTDOWN_FUNCTION(spl) /* {{{ */ return SUCCESS; } /* }}} */ -#ifdef HAVE_SIMPLEXML -static const zend_module_dep spl_deps[] = { - ZEND_MOD_REQUIRED("libxml") - ZEND_MOD_REQUIRED("simplexml") - {NULL, NULL, NULL} -}; -#endif - /* {{{ spl_module_entry */ zend_module_entry spl_module_entry = { -#ifdef HAVE_SIMPLEXML - STANDARD_MODULE_HEADER_EX, NULL, - spl_deps, -#else STANDARD_MODULE_HEADER, -#endif "SPL", spl_functions, PHP_MINIT(spl), |