diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-06-12 18:56:55 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-06-12 18:56:55 +0100 |
| commit | b44cf1a8540d321583a0d83ebca688ebab10d3b0 (patch) | |
| tree | b7fbafb4113ea150381a9bba7f98f45027e35b0b /main/php_streams.h | |
| parent | 6ac8bc4ecb1fdf112eefdd16d2c4f971e7ac232a (diff) | |
| parent | a2f4c32eb14221de79009aadaa3da9c3349e3526 (diff) | |
| download | php-git-b44cf1a8540d321583a0d83ebca688ebab10d3b0.tar.gz | |
Merge branch 'PHP-7.0' into openssl_error_store
Diffstat (limited to 'main/php_streams.h')
| -rw-r--r-- | main/php_streams.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/main/php_streams.h b/main/php_streams.h index de7c280050..cd5319ca22 100644 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -568,12 +568,6 @@ PHPAPI const char *php_stream_locate_eol(php_stream *stream, zend_string *buf); #define php_stream_open_wrapper(path, mode, options, opened) _php_stream_open_wrapper_ex((path), (mode), (options), (opened), NULL STREAMS_CC) #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) { \ - 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 - /* pushes an error message onto the stack for a wrapper instance */ PHPAPI void php_stream_wrapper_log_error(php_stream_wrapper *wrapper, int options, const char *fmt, ...) PHP_ATTRIBUTE_FORMAT(printf, 3, 4); |