0-10-09 Benjamin Kosnik <bkoz@purist.soma.redhat.com>

	* 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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0a77130d853eff06f263f453749496b201edabe6..2e7c3442cf161215dc9ecad4a137843cea815f4f 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,4 +1,4 @@
-2000-10-10  Benjamin Kosnik  <bkoz@purist.soma.redhat.com>
+2000-10-09  Benjamin Kosnik  <bkoz@purist.soma.redhat.com>
 
        * docs/configopts.html: Edit.
 

diff --git a/libstdc++-v3/libio/libioP.h b/libstdc++-v3/libio/libioP.h
index 4bbee9cba0a31407056777f00e0010046b38aea0..c2bf2c8205f08d2fd70e7143e6e22f766be82e75 100644 (file)
--- 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 <errno.h>
+#ifdef __cplusplus
+# include <cerrno>
+#else 
+# include <errno.h>
+#endif
+
 #ifndef __set_errno
 # define __set_errno(Val) errno = (Val)
 #endif