From: Nikita Popov <nikic@php.net>
Date: Sun, 14 Feb 2016 13:47:42 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~617^2~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d605e5f2448e0bc7141ca5d5cb27cb4d9f99aa9;p=php

Merge branch 'PHP-7.0'
---

2d605e5f2448e0bc7141ca5d5cb27cb4d9f99aa9
diff --cc main/php_streams.h
index e2dda520b6,de7c280050..92abaebf13
--- 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 */