helly Sat Oct 1 11:55:28 2005 EDT
Modified files:
/php-src/ext/spl config.m4 spl_sxe.c
/php-src/ext/simplexml config.m4
Log:
- MFB spl/simplexml integration (when sxe is shared)
http://cvs.php.net/diff.php/php-src/ext/spl/config.m4?r1=1.13&r2=1.14&ty=u
Index: php-src/ext/spl/config.m4
diff -u php-src/ext/spl/config.m4:1.13 php-src/ext/spl/config.m4:1.14
--- php-src/ext/spl/config.m4:1.13 Tue Feb 8 15:42:47 2005
+++ php-src/ext/spl/config.m4 Sat Oct 1 11:55:27 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.13 2005/02/08 20:42:47 helly Exp $
+dnl $Id: config.m4,v 1.14 2005/10/01 15:55:27 helly Exp $
dnl config.m4 for extension SPL
PHP_ARG_ENABLE(spl, enable SPL suppport,
@@ -10,5 +10,4 @@
fi
AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library)
support])
PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c
spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c
spl_observer.c, $ext_shared)
- PHP_ADD_EXTENSION_DEP(spl, simplexml)
fi
http://cvs.php.net/diff.php/php-src/ext/spl/spl_sxe.c?r1=1.11&r2=1.12&ty=u
Index: php-src/ext/spl/spl_sxe.c
diff -u php-src/ext/spl/spl_sxe.c:1.11 php-src/ext/spl/spl_sxe.c:1.12
--- php-src/ext/spl/spl_sxe.c:1.11 Tue Aug 23 05:33:45 2005
+++ php-src/ext/spl/spl_sxe.c Sat Oct 1 11:55:27 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_sxe.c,v 1.11 2005/08/23 09:33:45 dmitry Exp $ */
+/* $Id: spl_sxe.c,v 1.12 2005/10/01 15:55:27 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -146,13 +146,16 @@
SPL_API PHP_MINIT_FUNCTION(spl_sxe) /* {{{ */
{
- zend_class_entry *spl_ce_SimpleXML_Element =
sxe_get_element_class_entry(TSRMLS_C);
+ zend_class_entry **pce, *spl_ce_SimpleXMLElement;
- if (!spl_ce_SimpleXML_Element) {
+ if (zend_hash_find(CG(class_table), "simplexmlelement",
sizeof("SimpleXMLElement"), (void **) &pce) == FAILURE) {
+ spl_ce_SimpleXMLIterator = NULL;
return SUCCESS; /* SimpleXML must be initialized before */
}
- REGISTER_SPL_SUB_CLASS_EX(SimpleXMLIterator, SimpleXML_Element,
sxe_object_new, spl_funcs_SimpleXMLIterator);
+ spl_ce_SimpleXMLElement = *pce;
+
+ REGISTER_SPL_SUB_CLASS_EX(SimpleXMLIterator, SimpleXMLElement,
sxe_object_new, spl_funcs_SimpleXMLIterator);
REGISTER_SPL_IMPLEMENTS(SimpleXMLIterator, RecursiveIterator);
return SUCCESS;
http://cvs.php.net/diff.php/php-src/ext/simplexml/config.m4?r1=1.9&r2=1.10&ty=u
Index: php-src/ext/simplexml/config.m4
diff -u php-src/ext/simplexml/config.m4:1.9 php-src/ext/simplexml/config.m4:1.10
--- php-src/ext/simplexml/config.m4:1.9 Wed Apr 27 09:12:54 2005
+++ php-src/ext/simplexml/config.m4 Sat Oct 1 11:55:27 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.9 2005/04/27 13:12:54 sniper Exp $
+dnl $Id: config.m4,v 1.10 2005/10/01 15:55:27 helly Exp $
dnl config.m4 for extension simplexml
PHP_ARG_ENABLE(simplexml, whether to enable SimpleXML support,
@@ -23,4 +23,5 @@
AC_MSG_ERROR([xml2-config not found. Please check your libxml2
installation.])
])
PHP_ADD_EXTENSION_DEP(simplexml, libxml)
+ PHP_ADD_EXTENSION_DEP(simplexml, spl, true)
fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
