From 60dcebd71a10a04a73cbf9fa6f1ea1013bb3c3d1 Mon Sep 17 00:00:00 2001 From: Sascha Schumann Date: Thu, 27 Feb 2003 10:07:12 +0000 Subject: [PATCH] rename macro argument so that it does not partially match the string. fixes a warning on unixware --- main/php_streams.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/php_streams.h b/main/php_streams.h index 2bc6468cfc..bcb6c33f47 100755 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -234,8 +234,8 @@ PHPAPI php_stream *_php_stream_alloc(php_stream_ops *ops, void *abstract, # define php_stream_to_zval(stream, zval) { ZVAL_RESOURCE(zval, (stream)->rsrc_id); } #endif -#define php_stream_from_zval(str, ppzval) ZEND_FETCH_RESOURCE2((str), php_stream *, (ppzval), -1, "stream", php_file_le_stream(), php_file_le_pstream()) -#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()) +#define php_stream_from_zval(xstr, ppzval) ZEND_FETCH_RESOURCE2((xstr), php_stream *, (ppzval), -1, "stream", php_file_le_stream(), php_file_le_pstream()) +#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()) PHPAPI int php_stream_from_persistent_id(const char *persistent_id, php_stream **stream TSRMLS_DC); #define PHP_STREAM_PERSISTENT_SUCCESS 0 /* id exists */ -- 2.40.0