pajoye Mon, 29 Aug 2011 10:10:05 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=315683
Log:
- fix build, TSRMLS_FETCH must be the last declaration statement and init using
TSRM cannot be done before either
Changed paths:
U php/php-src/branches/PHP_5_4/ext/libxml/libxml.c
U php/php-src/trunk/ext/libxml/libxml.c
Modified: php/php-src/branches/PHP_5_4/ext/libxml/libxml.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/libxml/libxml.c 2011-08-29 09:53:25 UTC
(rev 315682)
+++ php/php-src/branches/PHP_5_4/ext/libxml/libxml.c 2011-08-29 10:10:05 UTC
(rev 315683)
@@ -937,9 +937,11 @@
**params[] = {&public,
&system, &ctxzv},
*retval_ptr = NULL;
int retval;
+ zend_fcall_info *fci;
TSRMLS_FETCH();
- zend_fcall_info *fci = &LIBXML(entity_loader).fci;
-
+
+ fci = &LIBXML(entity_loader).fci;
+
ALLOC_INIT_ZVAL(public);
if (ID != NULL) {
ZVAL_STRING(public, ID, 1);
Modified: php/php-src/trunk/ext/libxml/libxml.c
===================================================================
--- php/php-src/trunk/ext/libxml/libxml.c 2011-08-29 09:53:25 UTC (rev
315682)
+++ php/php-src/trunk/ext/libxml/libxml.c 2011-08-29 10:10:05 UTC (rev
315683)
@@ -937,9 +937,11 @@
**params[] = {&public,
&system, &ctxzv},
*retval_ptr = NULL;
int retval;
+ zend_fcall_info *fci;
TSRMLS_FETCH();
- zend_fcall_info *fci = &LIBXML(entity_loader).fci;
-
+
+ fci = &LIBXML(entity_loader).fci;
+
ALLOC_INIT_ZVAL(public);
if (ID != NULL) {
ZVAL_STRING(public, ID, 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
