cvs: php4 /main php_streams.h

derick Thu Jan 2 08:31:10 2003 EDT Modified files: /php4/main php_streams.h Log: - Fix warnings on UnixWare Index: php4/main/php_streams.h diff -u php4/main/php_streams.h:1.63 php4/main/php_streams.h:1.64 --- php4/main/php_streams.h:1.63 Tue Dec 31 10:58:54 2002 +++ php4/main/php_streams.h Thu Jan 2 08:31:10 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_streams.h,v 1.63 2002/12/31 15:58:54 sebastian Exp $ */ +/* $Id: php_streams.h,v 1.64 2003/01/02 13:31:10 derick Exp $ */ #ifndef PHP_STREAMS_H #define PHP_STREAMS_H @@ -318,8 +318,8 @@ # 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 */