cvs: php4 /ext/zlib php_zlib.h zlib.c

sniper Mon Jul 30 15:39:27 2001 EDT Modified files: /php4/ext/zlib php_zlib.h zlib.c Log: Make this compile in ZTS mode. Index: php4/ext/zlib/php_zlib.h diff -u php4/ext/zlib/php_zlib.h:1.16 php4/ext/zlib/php_zlib.h:1.17 --- php4/ext/zlib/php_zlib.h:1.16 Sat Jul 28 07:36:25 2001 +++ php4/ext/zlib/php_zlib.h Mon Jul 30 15:39:26 2001 @@ -17,15 +17,14 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_zlib.h,v 1.16 2001/07/28 11:36:25 zeev Exp $ */ +/* $Id: php_zlib.h,v 1.17 2001/07/30 19:39:26 sniper Exp $ */ #ifndef PHP_ZLIB_H #define PHP_ZLIB_H #include <zlib.h> - -typedef struct { +ZEND_BEGIN_MODULE_GLOBALS(zlib) int gzgetss_state; /* variables for transparent gzip encoding */ @@ -35,7 +34,7 @@ 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 @@ #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) Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.87 php4/ext/zlib/zlib.c:1.88 --- php4/ext/zlib/zlib.c:1.87 Mon Jul 30 02:18:10 2001 +++ php4/ext/zlib/zlib.c Mon Jul 30 15:39:26 2001 @@ -16,7 +16,7 @@ | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.87 2001/07/30 06:18:10 zeev Exp $ */ +/* $Id: zlib.c,v 1.88 2001/07/30 19:39:26 sniper Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -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 @@ }; /* }}} */ -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_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 @@ #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 @@ 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