diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
| commit | db72160e5ac2b267b9ffa23ad84e62e609382a44 (patch) | |
| tree | 6e50c2826f98308d500cc826934a503751d4d566 /ext/zlib/php_zlib.h | |
| parent | be88d0e5d4ab5fdf775f3e38cf054aa0451f0d36 (diff) | |
| parent | f469dc7429f2257aac6f46228302408608fbd62f (diff) | |
| download | php-git-db72160e5ac2b267b9ffa23ad84e62e609382a44.tar.gz | |
Merge branch 'master' into integer_semantics
Conflicts:
Zend/zend_operators.h
Diffstat (limited to 'ext/zlib/php_zlib.h')
| -rw-r--r-- | ext/zlib/php_zlib.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h index bd2a85bea6..703d6f516e 100644 --- a/ext/zlib/php_zlib.h +++ b/ext/zlib/php_zlib.h @@ -49,13 +49,13 @@ 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; + 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); |