Uli's libio/libstdc++ patches.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@15486 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 13 insertions, 1 deletions

diff --git a/libio/osform.cc b/libio/osform.cc
index 8c0011703da..f08f2efaa39 100644
--- a/libio/osform.cc
+++ b/libio/osform.cc
@@ -29,26 +29,38 @@ the executable file might be covered by the GNU General Public License. */
 ostream& ostream::form(const char *format ...)
 {
     if (opfx()) {
+	_IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile,
+				  _strbuf);
 	va_list ap;
 	va_start(ap, format);
 	_IO_vfprintf(rdbuf(), format, ap);
 	va_end(ap);
+	osfx();
+	_IO_cleanup_region_end (0);
     }
     return *this;
 }
 
 ostream& ostream::vform(const char *format, _IO_va_list args)
 {
-    if (opfx())
+    if (opfx()) {
+	_IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile,
+				  _strbuf);
 	_IO_vfprintf(rdbuf(), format, args);
+	osfx();
+	_IO_cleanup_region_end (0);
+    }
     return *this;
 }
 
 ostream& ostream::operator<<(const void *p)
 {
     if (opfx()) {
+	_IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile,
+				  _strbuf);
 	form("%p", p);
 	osfx();
+	_IO_cleanup_region_end (0);
     }
     return *this;
 }