diff options
| author | Zeev Suraski <zeev@php.net> | 2001-07-27 10:16:41 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-07-27 10:16:41 +0000 |
| commit | fe6f8712a439c8b5046a03bca9ce5ae8e75aa4f5 (patch) | |
| tree | c7bc98cac58386828871aae860f90cac0ebdcf8f /ext/xml | |
| parent | 2c254ba762d9392a732d5793b5b193ee6e395f1c (diff) | |
| download | php-git-fe6f8712a439c8b5046a03bca9ce5ae8e75aa4f5.tar.gz | |
- Get rid of ELS_*(), and use TSRMLS_*() instead.
- Move to the new ts_allocate_id() API
This patch is *bound* to break some files, as I must have had typos somewhere.
If you use any uncommon extension, please try to build it...
Diffstat (limited to 'ext/xml')
| -rw-r--r-- | ext/xml/xml.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 02651950c5..365ada931a 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -160,7 +160,7 @@ static int le_xml_parser; #ifdef ZTS -static void php_xml_init_globals(php_xml_globals *xml_globals) +static void php_xml_init_globals(php_xml_globals *xml_globals TSRMLS_DC) { XML(default_encoding) = "ISO-8859-1"; } @@ -171,7 +171,7 @@ PHP_MINIT_FUNCTION(xml) le_xml_parser = zend_register_list_destructors_ex(xml_parser_dtor, NULL, "xml", module_number); #ifdef ZTS - xml_globals_id = ts_allocate_id(sizeof(php_xml_globals), (ts_allocate_ctor) php_xml_init_globals, NULL); + ts_allocate_id(&xml_globals_id, sizeof(php_xml_globals), (ts_allocate_ctor) php_xml_init_globals, NULL); #else XML(default_encoding) = "ISO-8859-1"; #endif @@ -367,7 +367,7 @@ xml_set_handler(zval **handler, zval **data) static zval * xml_call_handler(xml_parser *parser, zval *handler, int argc, zval **argv) { - ELS_FETCH(); + TSRMLS_FETCH(); if (parser && handler) { zval *retval; |