From: Pierre Joye <pajoye@php.net>
Date: Fri, 9 Oct 2009 17:45:03 +0000 (+0000)
Subject: - Merge: Fixed bug #49572 (use of C++ style comments causes build failure)
X-Git-Tag: php-5.3.1RC2~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=883aa84f8ab324bb215ee8900b212db82e133b8e;p=php

- Merge: Fixed bug #49572 (use of C++ style comments causes build failure)
---

diff --git a/main/streams/memory.c b/main/streams/memory.c
index a44fba4c24..0643d3efa9 100644
--- a/main/streams/memory.c
+++ b/main/streams/memory.c
@@ -563,7 +563,7 @@ PHPAPI php_stream *_php_stream_temp_create(int mode, size_t max_memory_usage STR
 	stream = php_stream_alloc_rel(&php_stream_temp_ops, self, 0, mode & TEMP_STREAM_READONLY ? "rb" : "w+b");
 	stream->flags |= PHP_STREAM_FLAG_NO_BUFFER;
 	self->innerstream = php_stream_memory_create_rel(mode);
-	php_stream_auto_cleanup(self->innerstream); // do not warn if innerstream is GC'ed before stream
+	php_stream_auto_cleanup(self->innerstream); /* do not warn if innerstream is GC'ed before stream */
 	((php_stream_memory_data*)self->innerstream->abstract)->owner_ptr = &self->innerstream;
 
 	return stream;