diff options
author | George Wang <gwang@php.net> | 2014-10-03 16:43:58 -0400 |
---|---|---|
committer | George Wang <gwang@php.net> | 2014-10-03 16:43:58 -0400 |
commit | 2fd7d60ea06aa07b99dc219655be7ab42b7e2e16 (patch) | |
tree | 2835e4d2625870eb707e0361a769e4921aff8609 /ext/zlib/php_zlib.h | |
parent | a7d2747890846ed68cc86c6e8d3fd005525ff0cc (diff) | |
parent | e9b23401514a642b58084784305c1d19cf86a823 (diff) | |
download | php-git-2fd7d60ea06aa07b99dc219655be7ab42b7e2e16.tar.gz |
Merge branch 'master' of git.php.net:php-src
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 f76e4c2266..ba829b5888 100644 --- a/ext/zlib/php_zlib.h +++ b/ext/zlib/php_zlib.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ @@ -49,13 +49,13 @@ typedef struct _php_zlib_context { ZEND_BEGIN_MODULE_GLOBALS(zlib) /* variables for transparent gzip encoding */ - int compression_coding; zend_long output_compression; zend_long output_compression_level; char *output_handler; php_zlib_context *ob_gzhandler; zend_long output_compression_default; zend_bool handler_registered; + 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); |