diff options
| author | Anatol Belski <ab@php.net> | 2015-07-29 12:26:23 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-07-29 13:26:35 +0200 |
| commit | 4e66cce87ce0e57a7394486412e61abcfc5f3520 (patch) | |
| tree | 74da7597406fcb73d654f193d139c063b3c7093e /ext/zlib | |
| parent | 0615aa82d74f91efa4a5a7bcee1b9718fa03f15c (diff) | |
| download | php-git-4e66cce87ce0e57a7394486412e61abcfc5f3520.tar.gz | |
switch to the unified globals accessor where appropriate
Diffstat (limited to 'ext/zlib')
| -rw-r--r-- | ext/zlib/php_zlib.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h index b69c948523..b8930706a3 100644 --- a/ext/zlib/php_zlib.h +++ b/ext/zlib/php_zlib.h @@ -63,6 +63,8 @@ ZEND_BEGIN_MODULE_GLOBALS(zlib) int compression_coding; ZEND_END_MODULE_GLOBALS(zlib); +#define ZLIBG(v) ZEND_MODULE_GLOBALS_ACCESSOR(zlib, v) + php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, const char *path, const char *mode, int options, zend_string **opened_path, php_stream_context *context STREAMS_DC); extern php_stream_ops php_stream_gzio_ops; extern php_stream_wrapper php_stream_gzip_wrapper; @@ -71,13 +73,6 @@ extern zend_module_entry php_zlib_module_entry; #define zlib_module_ptr &php_zlib_module_entry #define phpext_zlib_ptr zlib_module_ptr -#ifdef ZTS -# include "TSRM.h" -# define ZLIBG(v) ZEND_TSRMG(zlib_globals_id, zend_zlib_globals *, v) -#else -# define ZLIBG(v) (zlib_globals.v) -#endif - #endif /* PHP_ZLIB_H */ /* |