svn: /php/php-src/branches/PHP_5_3_1/main/streams/ memory.c
| From: | Pierre-Alain Joye | Date: | Fri, 09 Oct 2009 17:45:03 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_3_1/main/streams/ memory.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-60636@lists.php.net to get a copy of this message | ||
pajoye Fri, 09 Oct 2009 17:45:03 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=289437
Log:
- Merge: Fixed bug #49572 (use of C++ style comments causes build failure)
Bug: http://bugs.php.net/49572 (Closed) use of C++ style
comments causes build failure
Changed paths:
U php/php-src/branches/PHP_5_3_1/main/streams/memory.c
Modified: php/php-src/branches/PHP_5_3_1/main/streams/memory.c
===================================================================
--- php/php-src/branches/PHP_5_3_1/main/streams/memory.c 2009-10-09 17:41:29 UTC (rev 289436)
+++ php/php-src/branches/PHP_5_3_1/main/streams/memory.c 2009-10-09 17:45:03 UTC (rev 289437)
@@ -563,7 +563,7 @@
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;