acinclude.m4 (GLIBCPP_CHECK_WCHAR_T_SUPPORT): Check for fgetwc, fgetws.

2001-06-09  Benjamin Kosnik  <bkoz@redhat.com>

	* acinclude.m4 (GLIBCPP_CHECK_WCHAR_T_SUPPORT): Check for fgetwc,
	fgetws.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.
	* include/c_std/bits/std_cwchar.h: Remove duplicate fgetwc
	injection, guard fgetwc, fgetws.
	* include/c_std/bits/std_cstdio.h: Remove superfluous includes.
	* include/c_std/bits/std_clocale.h: And here.
	* include/c_std/bits/std_cctype.h: And here.
	* include/c_std/bits/std_cstdlib.h (strtof): Guard strtof injection.

	* config/basic_file_stdio.h: Don't include unistd.h.
	* config/c_io_stdio.h: Don't use compatibility headers.
	* libsupc++/eh_terminate.cc: Qualify abort.
	(__terminate): And here.
	* libsupc++/eh_catch.cc (__cxa_end_catch): Qualify abort.

From-SVN: r43070

libstdc++-v3/ChangeLog

+2001-06-09  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* acinclude.m4 (GLIBCPP_CHECK_WCHAR_T_SUPPORT): Check for fgetwc,
+	fgetws.
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+	* include/c_std/bits/std_cwchar.h: Remove duplicate fgetwc
+	injection, guard fgetwc, fgetws.
+	* include/c_std/bits/std_cstdio.h: Remove superfluous includes.
+	* include/c_std/bits/std_clocale.h: And here.
+	* include/c_std/bits/std_cctype.h: And here.
+	* include/c_std/bits/std_cstdlib.h (strtof): Guard strtof injection.
+
+	* config/basic_file_stdio.h: Don't include unistd.h.
+	* config/c_io_stdio.h: Don't use compatibility headers.
+	* libsupc++/eh_terminate.cc: Qualify abort.
+	(__terminate): And here.
+	* libsupc++/eh_catch.cc (__cxa_end_catch): Qualify abort.
+	
 2001-06-08  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* include/c_std/bits/std_cstdlib.h: Remove _Exit, strtof injections.

libstdc++-v3/acinclude.m4

@@ -813,6 +813,9 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
     AC_CHECK_FUNCS(wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset \
     wcsrtombs mbsrtowcs, ac_wfuncs=yes, ac_wfuncs=no)
   
+    dnl Do quick checks for things injected into std:: by the c_std headers.
+    AC_CHECK_FUNCS(fgetwc, fgetws)
+
     AC_MSG_CHECKING([for ISO C99 wchar_t support])
     if test x"$has_weof" = xyes && test x"$has_wchar_minmax" = xyes \
        && test x"$ac_wfuncs" = xyes; then

libstdc++-v3/aclocal.m4

@@ -825,6 +825,9 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
     AC_CHECK_FUNCS(wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset \
     wcsrtombs mbsrtowcs, ac_wfuncs=yes, ac_wfuncs=no)
   
+    dnl Do quick checks for things injected into std:: by the c_std headers.
+    AC_CHECK_FUNCS(fgetwc, fgetws)
+
     AC_MSG_CHECKING([for ISO C99 wchar_t support])
     if test x"$has_weof" = xyes && test x"$has_wchar_minmax" = xyes \
        && test x"$ac_wfuncs" = xyes; then

libstdc++-v3/config.h.in

@@ -315,6 +315,9 @@
 /* Define if you have the fabsl function.  */
 #undef HAVE_FABSL
 
+/* Define if you have the fgetwc function.  */
+#undef HAVE_FGETWC
+
 /* Define if you have the finite function.  */
 #undef HAVE_FINITE
 

libstdc++-v3/config/basic_file_stdio.h

@@ -31,8 +31,6 @@
 // ISO C++ 14882: 27.8  File-based streams
 //
 
-#include <unistd.h>
-
 namespace std 
 {
   // Generic definitions for __basic_file

libstdc++-v3/config/c_io_stdio.h

@@ -32,8 +32,8 @@
 #ifndef _CPP_IO_STDIO_H
 #define _CPP_IO_STDIO_H 1
 
-#include <stdio.h>
-#include <stddef.h>
+#include <cstdio>
+#include <cstddef>
 #include <bits/gthr.h>
 
 namespace std 

libstdc++-v3/include/c_std/bits/std_cctype.h

@@ -34,8 +34,6 @@
 #ifndef _CPP_CCTYPE
 #define _CPP_CCTYPE 1
 
-#include <bits/c++config.h>
-
 #pragma GCC system_header
 #include_next <ctype.h>
 

libstdc++-v3/include/c_std/bits/std_clocale.h

@@ -34,8 +34,6 @@
 #ifndef _CPP_CLOCALE
 #define _CPP_CLOCALE 1
 
-#include <bits/c++config.h>
-
 #pragma GCC system_header
 #include_next <locale.h>
 

libstdc++-v3/include/c_std/bits/std_cstdio.h

@@ -34,10 +34,6 @@
 #ifndef _CPP_CSTDIO
 #define _CPP_CSTDIO 1
 
-#include <bits/c++config.h>
-#include <bits/std_cstdarg.h>
-#include <bits/std_cstddef.h>
-
 #pragma GCC system_header
 #include_next <stdio.h>
 

libstdc++-v3/include/c_std/bits/std_cstdlib.h

@@ -44,7 +44,7 @@
 #undef atoi
 #undef atol
 #undef strtod
-//#undef strtof
+#undef strtof
 #undef strtol
 #undef strtoul
 #undef rand
@@ -88,7 +88,9 @@ namespace std
   using ::atoi;
   using ::atol;
   using ::strtod;
-  //  using ::strtof;
+#if _GLIBCPP_HAVE_STRTOF
+  using ::strtof;
+#endif
   using ::strtol;
   using ::strtoul;
   using ::rand;

libstdc++-v3/include/c_std/bits/std_cwchar.h

@@ -127,9 +127,12 @@ namespace std
 
   using ::btowc;
   using ::wctob;
+#if _GLIBCPP_HAVE_FGETWC
   using ::fgetwc;
-  using ::fgetwc;
+#endif
+#if _GLIBCPP_HAVE_FGETWS
   using ::fgetws;
+#endif
   using ::fputwc;
   using ::fputws;
   using ::fwide;

libstdc++-v3/libsupc++/eh_catch.cc

@@ -89,7 +89,7 @@ __cxa_end_catch ()
     }
   else if (count < 0)
     // A bug in the exception handling library or compiler.
-    abort ();
+    std::abort ();
 
   header->handlerCount = count;
 }

libstdc++-v3/libsupc++/eh_terminate.cc

@@ -37,7 +37,7 @@
 using namespace __cxxabiv1;
 
 /* The current installed user handlers.  */
-std::terminate_handler __cxxabiv1::__terminate_handler = abort;
+std::terminate_handler __cxxabiv1::__terminate_handler = std::abort;
 std::unexpected_handler __cxxabiv1::__unexpected_handler = std::terminate;
 
 void
@@ -45,9 +45,9 @@ __cxxabiv1::__terminate (std::terminate_handler handler)
 {
   try {
     handler ();
-    abort ();
+    std::abort ();
   } catch (...) {
-    abort ();
+    std::abort ();
   }
 }