summaryrefslogtreecommitdiff
path: root/main/php_streams.h
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2003-02-27 10:07:12 +0000
committerSascha Schumann <sas@php.net>2003-02-27 10:07:12 +0000
commit60dcebd71a10a04a73cbf9fa6f1ea1013bb3c3d1 (patch)
tree7327901b2e9e8d43fcfa44acd32b3f9a42caff38 /main/php_streams.h
parent5e09029ba7b403ce3770f32d6056d59c675cd001 (diff)
downloadphp-git-60dcebd71a10a04a73cbf9fa6f1ea1013bb3c3d1.tar.gz
rename macro argument so that it does not partially match the string.
fixes a warning on unixware
Diffstat (limited to 'main/php_streams.h')
-rwxr-xr-xmain/php_streams.h4
1 files 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 */