diff options
| author | Sebastian Bergmann <sebastian@php.net> | 2005-08-12 14:08:28 +0000 |
|---|---|---|
| committer | Sebastian Bergmann <sebastian@php.net> | 2005-08-12 14:08:28 +0000 |
| commit | 52b001cc05fa1fb085aca9189a108d7029e9c463 (patch) | |
| tree | 0d5070c5f24f817647ed245fd6af4409498f3431 /ext/simplexml | |
| parent | 3aad9e2048217f0161f6a9fb50ac334f44d8fcc1 (diff) | |
| download | php-git-52b001cc05fa1fb085aca9189a108d7029e9c463.tar.gz | |
ZTS fixes.
Diffstat (limited to 'ext/simplexml')
| -rw-r--r-- | ext/simplexml/php_simplexml.h | 2 | ||||
| -rw-r--r-- | ext/simplexml/simplexml.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/simplexml/php_simplexml.h b/ext/simplexml/php_simplexml.h index 5a1da0f8f4..fbfe827443 100644 --- a/ext/simplexml/php_simplexml.h +++ b/ext/simplexml/php_simplexml.h @@ -79,7 +79,7 @@ typedef struct { #define SIMPLEXML_G(v) (simplexml_globals.v) #endif -ZEND_API zend_class_entry *sxe_get_element_class_entry(); +ZEND_API zend_class_entry *sxe_get_element_class_entry(TSRMLS_D); #endif diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index 4075472e7d..8fa9e0ac3b 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -40,7 +40,7 @@ zend_class_entry *sxe_class_entry = NULL; -ZEND_API zend_class_entry *sxe_get_element_class_entry() +ZEND_API zend_class_entry *sxe_get_element_class_entry(TSRMLS_D) { return U_CLASS_ENTRY(sxe_class_entry); } @@ -1357,7 +1357,7 @@ SXE_METHOD(__construct) int data_len; xmlDocPtr docp; - php_set_error_handling(EH_THROW, zend_exception_get_default() TSRMLS_CC); + php_set_error_handling(EH_THROW, zend_exception_get_default(TSRMLS_C) TSRMLS_CC); if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data, &data_len) == FAILURE) { php_std_error_handling(); return; @@ -1367,7 +1367,7 @@ SXE_METHOD(__construct) docp = xmlParseMemory(data, data_len); if (!docp) { ((php_libxml_node_object *)sxe)->document = NULL; - zend_throw_exception(zend_exception_get_default(), "String could not be parsed as XML", 0 TSRMLS_CC); + zend_throw_exception(zend_exception_get_default(TSRMLS_C), "String could not be parsed as XML", 0 TSRMLS_CC); return; } |