From af7db8cb22256d2ba4039fe9ef231702f4bb92c2 Mon Sep 17 00:00:00 2001 From: bkoz Date: Tue, 17 Oct 2000 08:25:08 +0000 Subject: 2000-10-16 Benjamin Kosnik Shadow headers would work if libsupc++ was strict about namespaces. This only possible if g++ maps std::size_t -> size_t. (Hint hint.) * include/c_std/assert.h: Add guards. * include/c_std/bits/std_climits.h: Correct typo. * include/c_std/ctype.h: Remove #error. * libio/libioP.h: Break up extern "C" bits around includes. * libio/libio.h: Only include C headers, or else _C_legacy namespaces will be nested. * libio/libioP.h: Same here. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36900 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/libio/libioP.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'libstdc++-v3/libio/libioP.h') diff --git a/libstdc++-v3/libio/libioP.h b/libstdc++-v3/libio/libioP.h index c2bf2c8205f..598949d8988 100644 --- a/libstdc++-v3/libio/libioP.h +++ b/libstdc++-v3/libio/libioP.h @@ -23,11 +23,7 @@ other reasons why the executable file might be covered by the GNU General Public License. */ -#ifdef __cplusplus -# include -#else # include -#endif #ifndef __set_errno # define __set_errno(Val) errno = (Val) @@ -620,11 +616,19 @@ extern void (*_IO_cleanup_registration_needed) __PMT ((void)); #if _G_HAVE_MMAP +#ifdef __cplusplus +} +#endif + # include # include # include # include +#ifdef __cplusplus +extern "C" { +#endif + # if !defined(MAP_ANONYMOUS) && defined(MAP_ANON) # define MAP_ANONYMOUS MAP_ANON # endif -- cgit v1.2.3