Skip to content

Commit 60dcebd

Browse files
author
Sascha Schumann
committed
rename macro argument so that it does not partially match the string.
fixes a warning on unixware
1 parent 5e09029 commit 60dcebd

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

main/php_streams.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,8 @@ PHPAPI php_stream *_php_stream_alloc(php_stream_ops *ops, void *abstract,
234234
# define php_stream_to_zval(stream, zval) { ZVAL_RESOURCE(zval, (stream)->rsrc_id); }
235235
#endif
236236

237-
#define php_stream_from_zval(str, ppzval) ZEND_FETCH_RESOURCE2((str), php_stream *, (ppzval), -1, "stream", php_file_le_stream(), php_file_le_pstream())
238-
#define php_stream_from_zval_no_verify(str, ppzval) (str) = (php_stream*)zend_fetch_resource((ppzval) TSRMLS_CC, -1, "stream", NULL, 2, php_file_le_stream(), php_file_le_pstream())
237+
#define php_stream_from_zval(xstr, ppzval) ZEND_FETCH_RESOURCE2((xstr), php_stream *, (ppzval), -1, "stream", php_file_le_stream(), php_file_le_pstream())
238+
#define php_stream_from_zval_no_verify(xstr, ppzval) (xstr) = (php_stream*)zend_fetch_resource((ppzval) TSRMLS_CC, -1, "stream", NULL, 2, php_file_le_stream(), php_file_le_pstream())
239239

240240
PHPAPI int php_stream_from_persistent_id(const char *persistent_id, php_stream **stream TSRMLS_DC);
241241
#define PHP_STREAM_PERSISTENT_SUCCESS 0 /* id exists */

0 commit comments

Comments
 (0)