diff options
| author | foobar <sniper@php.net> | 2001-07-30 19:39:26 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2001-07-30 19:39:26 +0000 |
| commit | 3b7bc2535abea052548fe7635f2c3ec530af4ae7 (patch) | |
| tree | 743164f4422627d40fe8202fe4c1085d8e677cb0 | |
| parent | 1594f0967b69decb9cc088e87d894af0cf2e4240 (diff) | |
| download | php-git-3b7bc2535abea052548fe7635f2c3ec530af4ae7.tar.gz | |
Make this compile in ZTS mode.
| -rw-r--r-- | ext/zlib/php_zlib.h | 6 | ||||
| -rw-r--r-- | ext/zlib/zlib.c | 20 |
2 files changed, 10 insertions, 16 deletions
diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h index eccbc552e2..f0732ded31 100644 --- a/ext/zlib/php_zlib.h +++ b/ext/zlib/php_zlib.h @@ -24,8 +24,7 @@ #include <zlib.h> - -typedef struct { +ZEND_BEGIN_MODULE_GLOBALS(zlib) int gzgetss_state; /* variables for transparent gzip encoding */ @@ -35,7 +34,7 @@ typedef struct { int ob_gzhandler_status; int ob_gzip_coding; int output_compression; -} php_zlib_globals; +ZEND_END_MODULE_GLOBALS(zlib) extern zend_module_entry php_zlib_module_entry; #define zlib_module_ptr &php_zlib_module_entry @@ -70,7 +69,6 @@ int php_enable_output_compression(int buffer_size); #ifdef ZTS -#define ZLIBG(v) (zlib_globals->v) #define ZLIBG(v) TSRMG(zlib_globals_id, zend_zlib_globals *, v) #else #define ZLIBG(v) (zlib_globals.v) diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 4981d5ce98..92a5d347ac 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -71,12 +71,6 @@ #endif #endif -#ifdef ZTS -int zlib_globals_id; -#else -static php_zlib_globals zlib_globals; -#endif - #define OS_CODE 0x03 /* FIXME */ #define CODING_GZIP 1 #define CODING_DEFLATE 2 @@ -113,10 +107,6 @@ function_entry php_zlib_functions[] = { }; /* }}} */ -PHP_INI_BEGIN() - STD_PHP_INI_BOOLEAN("zlib.output_compression", "0", PHP_INI_ALL, OnUpdateInt, output_compression, php_zlib_globals, zlib_globals) -PHP_INI_END() - /* {{{ php_zlib_module_entry */ zend_module_entry php_zlib_module_entry = { @@ -131,10 +121,16 @@ zend_module_entry php_zlib_module_entry = { }; /* }}} */ +ZEND_DECLARE_MODULE_GLOBALS(zlib) + #ifdef COMPILE_DL_ZLIB ZEND_GET_MODULE(php_zlib) #endif +PHP_INI_BEGIN() + STD_PHP_INI_BOOLEAN("zlib.output_compression", "0", PHP_INI_ALL, OnUpdateInt, output_compression, zend_zlib_globals, zlib_globals) +PHP_INI_END() + /* {{{ phpi_destructor_gzclose */ static void phpi_destructor_gzclose(zend_rsrc_list_entry *rsrc) @@ -147,7 +143,7 @@ static void phpi_destructor_gzclose(zend_rsrc_list_entry *rsrc) #ifdef ZTS /* {{{ php_zlib_init_globals */ -static void php_zlib_init_globals(php_zlib_globals *zlib_globals_p TSRMLS_DC) +static void php_zlib_init_globals(zend_zlib_globals *zlib_globals_p TSRMLS_DC) { ZLIBG(gzgetss_state) = 0; } @@ -159,7 +155,7 @@ static void php_zlib_init_globals(php_zlib_globals *zlib_globals_p TSRMLS_DC) PHP_MINIT_FUNCTION(zlib) { #ifdef ZTS - ts_allocate_id(&zlib_globals_id, sizeof(php_zlib_globals), (ts_allocate_ctor) php_zlib_init_globals, NULL); + ts_allocate_id(&zlib_globals_id, sizeof(zend_zlib_globals), (ts_allocate_ctor) php_zlib_init_globals, NULL); #else ZLIBG(gzgetss_state)=0; #endif |