diff options
| author | Nikita Popov <nikic@php.net> | 2016-03-03 23:13:50 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-03-03 23:20:12 +0100 |
| commit | 5602f6421372848a6fbb23fbe6bbca47d94dd49a (patch) | |
| tree | 6ac033d376ecbb817b71895dfa92b96fc351c73e /main/php_streams.h | |
| parent | 3240dd93b3f8a92ae587df20d7e07d436d0be2a9 (diff) | |
| download | php-git-5602f6421372848a6fbb23fbe6bbca47d94dd49a.tar.gz | |
Eliminate usages of _PP macros
These are either in debug code (fix them), commented out (drop
them) or in dead compatibility macros (drop them).
One usage was in php_stream_get_from_zval(), which we have not used
since at least PHP 5.2 and, judging from the fact that nobody
complained about it causing compile errors in PHP 7, nobody else
uses it either, so drop it.
There are still remaining uses in mysqli embedded and odbc birdstep.
These probably need to be dropped outright.
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); |