diff options
| author | Nikita Popov <nikic@php.net> | 2014-08-25 21:21:16 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-08-25 21:52:18 +0200 |
| commit | 6db293d5e043d35c281a6b11cb68460f5d7188a9 (patch) | |
| tree | d1880c1810fe147de6ff7f8ff317b4ec300a518f /ext/zlib/php_zlib.h | |
| parent | 7813d85d3d5901b24f77b63538eb6754e161f471 (diff) | |
| parent | 455741fce3c4f4392deb97775cba7a39f6490271 (diff) | |
| download | php-git-6db293d5e043d35c281a6b11cb68460f5d7188a9.tar.gz | |
Merge remote-tracking branch 'php-src/master' into ast
Conflicts:
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_globals.h
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner.l
Zend/zend_types.h
Diffstat (limited to 'ext/zlib/php_zlib.h')
| -rw-r--r-- | ext/zlib/php_zlib.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h index bd2a85bea6..f76e4c2266 100644 --- a/ext/zlib/php_zlib.h +++ b/ext/zlib/php_zlib.h @@ -50,11 +50,11 @@ typedef struct _php_zlib_context { ZEND_BEGIN_MODULE_GLOBALS(zlib) /* variables for transparent gzip encoding */ int compression_coding; - long output_compression; - long output_compression_level; + zend_long output_compression; + zend_long output_compression_level; char *output_handler; php_zlib_context *ob_gzhandler; - long output_compression_default; + zend_long output_compression_default; zend_bool handler_registered; ZEND_END_MODULE_GLOBALS(zlib); |