summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/simplexml/php_simplexml.h5
-rw-r--r--ext/simplexml/simplexml.c30
2 files changed, 11 insertions, 24 deletions
diff --git a/ext/simplexml/php_simplexml.h b/ext/simplexml/php_simplexml.h
index 0fa8f8f..f4f5d74 100644
--- a/ext/simplexml/php_simplexml.h
+++ b/ext/simplexml/php_simplexml.h
@@ -47,9 +47,9 @@ extern zend_module_entry simplexml_module_entry;
#include <libxml/xmlschemas.h>
PHP_MINIT_FUNCTION(simplexml);
-PHP_MSHUTDOWN_FUNCTION(simplexml);
+#if HAVE_SPL && !defined(COMPILE_DL_SPL)
PHP_RINIT_FUNCTION(simplexml);
-PHP_RSHUTDOWN_FUNCTION(simplexml);
+#endif
PHP_MINFO_FUNCTION(simplexml);
typedef struct {
@@ -82,7 +82,6 @@ typedef struct {
#endif
-
/*
* Local variables:
* tab-width: 4
diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 9092af8..964c237 100644
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -1578,9 +1578,13 @@ zend_module_entry simplexml_module_entry = {
"simplexml",
simplexml_functions,
PHP_MINIT(simplexml),
- PHP_MSHUTDOWN(simplexml),
- PHP_RINIT(simplexml),
- PHP_RSHUTDOWN(simplexml),
+ NULL,
+#if HAVE_SPL && !defined(COMPILE_DL_SPL)
+ PHP_RINIT(simplexml),
+#else
+ NULL,
+#endif
+ NULL,
PHP_MINFO(simplexml),
"0.1",
STANDARD_MODULE_PROPERTIES
@@ -1631,32 +1635,16 @@ PHP_MINIT_FUNCTION(simplexml)
}
/* }}} */
-/* {{{ PHP_MSHUTDOWN_FUNCTION(simplexml)
- */
-PHP_MSHUTDOWN_FUNCTION(simplexml)
-{
- return SUCCESS;
-}
-/* }}} */
-
+#if HAVE_SPL && !defined(COMPILE_DL_SPL)
/* {{{ PHP_RINIT_FUNCTION(simplexml)
*/
PHP_RINIT_FUNCTION(simplexml)
{
-#if HAVE_SPL && !defined(COMPILE_DL_SPL)
zend_class_implements(sxe_class_entry TSRMLS_CC, 1, spl_ce_RecursiveIterator);
-#endif
- return SUCCESS;
-}
-/* }}} */
-
-/* {{{ PHP_RSHUTDOWN_FUNCTION(simplexml)
- */
-PHP_RSHUTDOWN_FUNCTION(simplexml)
-{
return SUCCESS;
}
/* }}} */
+#endif
/* {{{ PHP_MINFO_FUNCTION(simplexml)
*/