diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 859bf8468003..618da3cc8675 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,7 @@
 2007-05-07  Jason Merrill  <jason@redhat.com>
 
+	* include/bits/ostream.tcc (operator<<(char*)): Add __s.
+
 	* config/abi/pre/gnu.ver: Fix symbol versions.
 	* config/abi/pre/gnu-versioned-namespace.ver: Likewise.
 
diff --git a/libstdc++-v3/include/bits/ostream.tcc b/libstdc++-v3/include/bits/ostream.tcc
index 4691c64827ab..c8bb8f65a7c1 100644
--- a/libstdc++-v3/include/bits/ostream.tcc
+++ b/libstdc++-v3/include/bits/ostream.tcc
@@ -336,10 +336,10 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 	    {
 	      struct __ptr_guard
 	      {
-		_CharT *p;
-		__ptr_guard (_CharT *ip): p(ip) { }
-		~__ptr_guard() { delete[] p; }
-		_CharT* __get() { return p; }
+		_CharT *__p;
+		__ptr_guard (_CharT *__ip): __p(__ip) { }
+		~__ptr_guard() { delete[] __p; }
+		_CharT* __get() { return __p; }
 	      } __pg (new _CharT[__clen]);
 
 	      _CharT *__ws = __pg.__get();