diff options
| author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
| commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
| tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /ext/zlib/php_zlib.h | |
| parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
| parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
| download | php-git-POST_NATIVE_TLS_MERGE.tar.gz | |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'ext/zlib/php_zlib.h')
| -rw-r--r-- | ext/zlib/php_zlib.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h index ba829b5888..a93e46d339 100644 --- a/ext/zlib/php_zlib.h +++ b/ext/zlib/php_zlib.h @@ -58,7 +58,7 @@ ZEND_BEGIN_MODULE_GLOBALS(zlib) int compression_coding; ZEND_END_MODULE_GLOBALS(zlib); -php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, const char *path, const char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC); +php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, const char *path, const char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC); extern php_stream_ops php_stream_gzio_ops; extern php_stream_wrapper php_stream_gzip_wrapper; extern php_stream_filter_factory php_zlib_filter_factory; @@ -68,7 +68,7 @@ extern zend_module_entry php_zlib_module_entry; #ifdef ZTS # include "TSRM.h" -# define ZLIBG(v) TSRMG(zlib_globals_id, zend_zlib_globals *, v) +# define ZLIBG(v) ZEND_TSRMG(zlib_globals_id, zend_zlib_globals *, v) #else # define ZLIBG(v) (zlib_globals.v) #endif |