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

diff --git a/NEWS b/NEWS
index 8c3aaeb84784f5440532f371cdcabeab067e2999..6d25bea227a4da598f3abd36c0a38a394cd0ed5e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -125,6 +125,8 @@ PHP                                                                        NEWS
 - Fixed bug #42434 (ImageLine w/ antialias = 1px shorter).
   (wojjie at gmail dot com, Kalle)
 - Fixed bug #28038 (Sent incorrect RCPT TO commands to SMTP server) (Garrett)
+- Fixed bug #49572 (use of C++ style comments causes build failure).
+  (Sriram Natarajan)
 
 17 Jun 2009, PHP 5.2.10
 - Added "ignore_errors" option to http fopen wrapper. (David Zulke, Sara)

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;