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

diff --git a/NEWS b/NEWS
index b1502689a61222e86a2c7c92356fe05b63e27fd1..07bd373245b8bd0370731856f38f2fccfdfa43a1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,8 @@ PHP                                                                        NEWS
   (Ryan Sleevi, Ilia)
 - Fixed bug #49470 (FILTER_SANITIZE_EMAIL allows disallowed characters).
   (Ilia)
+- Fixed bug #49572 (use of C++ style comments causes build failure).
+  (Sriram Natarajan)
 
 
 ?? ??? 2009, PHP 5.3.1

diff --git a/main/streams/memory.c b/main/streams/memory.c
index a44fba4c24275a6351f0c5b05c3a07c3c1ebf9c5..0643d3efa9e21bdee220a55b1037328b3265f7a1 100644 (file)
--- 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;