From: Derick Rethans Date: Thu, 2 Jan 2003 13:31:10 +0000 (+0000) Subject: - Fix warnings on UnixWare X-Git-Tag: PHP_5_0_dev_before_13561_fix~531 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da9eb594c6d2cc372f0acea1a2c5755b15198802;p=php - Fix warnings on UnixWare --- diff --git a/main/php_streams.h b/main/php_streams.h index 24b1947be4..c506b060f2 100755 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -318,8 +318,8 @@ PHPAPI php_stream_filter *php_stream_filter_create(const char *filtername, const # define php_stream_to_zval(stream, zval) { ZVAL_RESOURCE(zval, (stream)->rsrc_id); } #endif -#define php_stream_from_zval(stream, ppzval) ZEND_FETCH_RESOURCE2((stream), php_stream *, (ppzval), -1, "stream", php_file_le_stream(), php_file_le_pstream()) -#define php_stream_from_zval_no_verify(stream, ppzval) (stream) = (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(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()) PHPAPI int php_stream_from_persistent_id(const char *persistent_id, php_stream **stream TSRMLS_DC); #define PHP_STREAM_PERSISTENT_SUCCESS 0 /* id exists */