locale_facets.h (class moneypunct): Fix typos.

2001-02-05   Benjamin Kosnik  <bkoz@redhat.com>

	* include/bits/locale_facets.h (class moneypunct): Fix typos.
	* libsupc++/pure.cc: Revert.

From-SVN: r39484

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 654a557cfbc5b7ea23641529a181a3d934416a54..2f87bd3e68b7d06163e26d7176a44ddc06e12244 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,6 +1,7 @@
 2001-02-05   Benjamin Kosnik  <bkoz@redhat.com>
 
        * include/bits/locale_facets.h (class moneypunct): Fix typos.
+       * libsupc++/pure.cc: Revert.
 
 2001-02-05   Benjamin Kosnik  <bkoz@redhat.com>
 

diff --git a/libstdc++-v3/libsupc++/pure.cc b/libstdc++-v3/libsupc++/pure.cc
index e4f14d31b944536988b95e23b9c50eed718e9aa7..7ada0666856a6fe90fc8c9ce8809c10186be7561 100644 (file)
--- a/libstdc++-v3/libsupc++/pure.cc
+++ b/libstdc++-v3/libsupc++/pure.cc
@@ -1,5 +1,5 @@
 // -*- C++ -*- 
-// Copyright (C) 2000, 2001 Free Software Foundation
+// Copyright (C) 2000 Free Software Foundation
 //
 // This file is part of GNU CC.
 //
@@ -28,7 +28,19 @@
 // the GNU General Public License.
 
 #include <bits/c++config.h>
-#include <cstdio>
+
+#ifdef _GLIBCPP_HAVE_UNISTD_H
+# include <unistd.h>
+# define writestr(str) write(2, str, sizeof(str) - 1)
+# ifdef __GNU_LIBRARY__
+  /* Avoid forcing the library's meaning of `write' on the user program
+     by using the "internal" name (for use within the library).  */
+/*#  define write(fd, buf, n)  __write((fd), (buf), (n))*/
+# endif
+#else
+# include <stdio.h>
+# define writestr(str) fputs(str, stderr)
+#endif
 
 extern "C" {
 
@@ -45,9 +57,8 @@ extern void __terminate(void) __attribute__ ((__noreturn__));
 void
 PURE_VIRTUAL_NAME (void)
 {
-  std::fputs ("pure virtual method called\n", stderr);
+  writestr ("pure virtual method called\n");
   __terminate ();
 }
 
 }
-