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/zlib/zlib.c | |
| 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/zlib/zlib.c')
| -rw-r--r-- | ext/zlib/zlib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 5d36cec76f..f31d2eb91b 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -147,7 +147,7 @@ static void phpi_destructor_gzclose(zend_rsrc_list_entry *rsrc) #ifdef ZTS /* {{{ php_zlib_init_globals */ -static void php_zlib_init_globals(ZLIBLS_D) +static void php_zlib_init_globals(ZLIBLS_D TSRMLS_DC) { ZLIBG(gzgetss_state) = 0; } @@ -161,9 +161,9 @@ PHP_MINIT_FUNCTION(zlib) PLS_FETCH(); #ifdef ZTS - zlib_globals_id = ts_allocate_id(sizeof(php_zlib_globals), (ts_allocate_ctor) php_zlib_init_globals, NULL); + ts_allocate_id(&zlib_globals_id, sizeof(php_zlib_globals), (ts_allocate_ctor) php_zlib_init_globals, NULL); #else - ZLIBG(gzgetss_state)=0; + ZLIBG(gzgetss_state)=0; #endif le_zp = zend_register_list_destructors_ex(phpi_destructor_gzclose, NULL, "zlib", module_number); @@ -1257,7 +1257,7 @@ static void php_gzip_output_handler(char *output, uint output_len, char **handle int php_enable_output_compression(int buffer_size) { zval **a_encoding, **data; - ELS_FETCH(); + TSRMLS_FETCH(); ZLIBLS_FETCH(); if (zend_hash_find(&EG(symbol_table), "HTTP_SERVER_VARS", sizeof("HTTP_SERVER_VARS"), (void **) &data)==FAILURE |