1 files changed, 6 insertions, 27 deletions
diff --git a/libstdc++-v3/shadow/bits/wrap_libio.h b/libstdc++-v3/shadow/bits/wrap_libio.h
index a196844deb3..e5da6e3f382 100644
--- a/libstdc++-v3/shadow/bits/wrap_libio.h
+++ b/libstdc++-v3/shadow/bits/wrap_libio.h
@@ -1,6 +1,6 @@
 // -*- C++ -*- header wrapper.
 
-// Copyright (C) 1997-1999 Free Software Foundation, Inc.
+// Copyright (C) 1997-1999, 2000 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -28,42 +28,21 @@
 // the GNU General Public License.
 
 //
-// ISO C++ 14882: 20.5  Date and time
+// ISO C++ 14882: 20.5 Extensions  
 //
 
-// XXX incomplete
-
 #ifndef _CPP_WRAP_LIBIO_H
 #define _CPP_WRAP_LIBIO_H 1
 
-  namespace _C_legacy {
-    extern "C" {
+namespace _C_legacy {
+  extern "C" {
 #     define _IN_C_LEGACY_
 #     pragma GCC system_header
 #     include_next <libio.h>
-    }
-
-    namespace _C_shadow { }
-  } // close namespace ::_C_legacy::
-
-// #  undef that
-
-  namespace _C_legacy {
-    namespace _C_shadow {
-      // typedef stuff
-    }
   }
-  namespace std {
-
-    // using ::_C_legacy::stuff
+} // namespace _C_legacy
 
-  } // close namespace std::
-  
-  namespace _C_legacy {
-    namespace _C_shadow {
-      // using ::std::stuff
-    }
-  }
+// NB: Don't bring elements from this non-standard header into namespace std.
 
 # undef _IN_C_LEGACY_