Make this compile in ZTS mode.

diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h
index eccbc552e241653ec236455fbdcf6afd336c57fb..f0732ded316ccca68f5fb37de3b244947d38234a 100644 (file)
--- 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 4981d5ce98696083d263af39b4e35148531e4310..92a5d347ac1e37cd14ee9aea1435f25e05785e66 100644 (file)
--- 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