com php-src: Merge branch 'PHP-7.0': Zend/zend_API.c ext/ openssl/openssl.c ext/zip/php_zip.c main/php.h ma in/php_streams.h
sapi/phpdbg/phpdbg_opcode.c sapi/p hpdbg/phpdbg_prompt.c

Commit: 2d605e5f2448e0bc7141ca5d5cb27cb4d9f99aa9 Author: Nikita Popov <nikic@php.net> Sun, 14 Feb 2016 14:47:42 +0100 Parents: be607e724c69c92f8cda72a45a13a26e7c439aec c9357f82d3882eb3c7cb9f63dbc98d354fb20739 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2d605e5f2448e0bc7141ca5d5cb27cb4d9f99aa9 Log: Merge branch 'PHP-7.0' Changed paths: MM Zend/zend_API.c MM ext/openssl/openssl.c MM ext/zip/php_zip.c MM main/php.h MM main/php_streams.h MM sapi/phpdbg/phpdbg_opcode.c MM sapi/phpdbg/phpdbg_prompt.c Diff: diff --cc main/php_streams.h index e2dda52,de7c280..92abaeb --- a/main/php_streams.h +++ b/main/php_streams.h @@@ -573,17 -569,13 +569,13 @@@ PHPAPI const char *php_stream_locate_eo #define php_stream_open_wrapper_ex(path, mode, options, opened, context) _php_stream_open_wrapper_ex((path), (mode), (options), (opened), (context) STREAMS_CC) #define php_stream_get_from_zval(stream, zstream, mode, options, opened, context) \ - if (Z_TYPE_PP((zstream)) == IS_RESOURCE) { \ + if (Z_TYPE_P((zstream)) == IS_RESOURCE) { \ php_stream_from_zval((stream), (zstream)); \ - } else (stream) = Z_TYPE_PP((zstream)) == IS_STRING ? \ - php_stream_open_wrapper_ex(Z_STRVAL_PP((zstream)), (mode), (options), (opened), (context)) : NULL + } else (stream) = Z_TYPE_P((zstream)) == IS_STRING ? \ + php_stream_open_wrapper_ex(Z_STRVAL_P((zstream)), (mode), (options), (opened), (context)) : NULL /* pushes an error message onto the stack for a wrapper instance */ - #ifdef ZTS - PHPAPI void php_stream_wrapper_log_error(php_stream_wrapper *wrapper, int options, const char *fmt, ...) PHP_ATTRIBUTE_FORMAT(printf, 4, 5); - #else PHPAPI void php_stream_wrapper_log_error(php_stream_wrapper *wrapper, int options, const char *fmt, ...) PHP_ATTRIBUTE_FORMAT(printf, 3, 4); - #endif #define PHP_STREAM_UNCHANGED 0 /* orig stream was seekable anyway */ #define PHP_STREAM_RELEASED 1 /* newstream should be used; origstream is no longer valid */