Fix php_stream_get_from_zval(), so that it works under PHP7

# We don't use zval** anymore, nor do any extension in PECL or core
# currently use this macro, but third party could. See PR#1562 on Github

diff --git a/main/php_streams.h b/main/php_streams.h
index 255b065bd4c77a555fb601d9dde820b3863063de..c37d104cc8a9c2ce922df205014f3c4f83fdd416 100644 (file)
--- a/main/php_streams.h
+++ b/main/php_streams.h
@@ -573,10 +573,10 @@ PHPAPI const char *php_stream_locate_eol(php_stream *stream, zend_string *buf);
 #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