cvs: php4 /main php_streams.h

sas Thu Feb 27 05:07:12 2003 EDT Modified files: /php4/main php_streams.h Log: rename macro argument so that it does not partially match the string. fixes a warning on unixware Index: php4/main/php_streams.h diff -u php4/main/php_streams.h:1.73 php4/main/php_streams.h:1.74 --- php4/main/php_streams.h:1.73 Mon Feb 24 20:39:06 2003 +++ php4/main/php_streams.h Thu Feb 27 05:07:12 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_streams.h,v 1.73 2003/02/25 01:39:06 iliaa Exp $ */ +/* $Id: php_streams.h,v 1.74 2003/02/27 10:07:12 sas Exp $ */ #ifndef PHP_STREAMS_H #define PHP_STREAMS_H @@ -234,8 +234,8 @@ # 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 */