From 3ec840ea2e865e4a69965fb132256dbc88449a94 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Mon, 9 Oct 2000 09:03:36 +0000 Subject: [PATCH] 0-10-09 Benjamin Kosnik * docs/configopts.html: Edit. * libio/Makefile.am (INCLUDES): Remove duplicates, simplify. * libio/Makefile.in: Regenerate. * libmath/Makefile.am (INCLUDES): Remove duplicates, simplify. * libmath/Makefile.in: Regenerate. * libsupc++/Makefile.am (INCLUDES): Remove duplicate. * libsupc++/Makefile.in: Regenerate. * Makefile.am (AM_MAKEFLAGS): Add GLIBCPP_INCLUDES, TOPLEVEL_INCLUDES, LIBMATH_INCLUDES, LIBIO_INCLUDES, CSHADOW_INCLUDES up here. * Makefile.in: Regenerate. * src/Makefile.am (CSHADOW_INCLUDES): Add include/c_std, include/c for shadow headers. (myinstallheaders): Change glibcpp_includedir to GLIBCPP_INCLUDES. Move GLIBCPP_INCLUDES, TOPLEVEL_INCLUDES, LIBMATH_INCLUDES, LIBIO_INCLUDES, CSHADOW_INCLUDES up Makefile hierarchy. * src/Makefile.in: Regenerate. * include/c: New directory. * include/c/bits/(std_cassert.h, std_cctype.h, std_cerrno.h, std_cfloat.h, std_climits.h, std_clocale.h, std_cmath.h, std_csetjmp.h, std_csignal.h, std_cstdarg.h, std_cstddef.h, std_cstdio.h, std_cstdlib.h, std_cstring.h, std_ctime.h, std_cwchar.h, std_cwctype.h): Add, moving from... * include/bits: ...here. * include/c_std: New directory. * include/c_std/bits/*: Populate from... * shadow: ...here. Remove directory. From-SVN: r36806 --- libstdc++-v3/ChangeLog | 2 +- libstdc++-v3/libio/libioP.h | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0a77130d853..2e7c3442cf1 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,4 +1,4 @@ -2000-10-10 Benjamin Kosnik +2000-10-09 Benjamin Kosnik * docs/configopts.html: Edit. diff --git a/libstdc++-v3/libio/libioP.h b/libstdc++-v3/libio/libioP.h index 4bbee9cba0a..c2bf2c8205f 100644 --- a/libstdc++-v3/libio/libioP.h +++ b/libstdc++-v3/libio/libioP.h @@ -23,7 +23,12 @@ other reasons why the executable file might be covered by the GNU General Public License. */ -#include +#ifdef __cplusplus +# include +#else +# include +#endif + #ifndef __set_errno # define __set_errno(Val) errno = (Val) #endif