From: David Edelsohn <edelsohn@gnu.org>
Date: Fri, 3 Nov 2000 23:01:19 +0000 (+0000)
Subject: std_cwchar.h: Undefine macro that conflicts with function name defined in this file.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=50149aa9f99b60391899f18062a84ecb533cfd34;p=gcc.git

std_cwchar.h: Undefine macro that conflicts with function name defined in this file.

	* include/c/bits/std_cwchar.h: Undefine macro that conflicts
	with function name defined in this file.

From-SVN: r37238
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 17781253f77..e14ac974625 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-03  David Edelsohn  <edelsohn@gnu.org>
+
+	* include/c/bits/std_cwchar.h: Undefine macro that conflicts
+	with function name defined in this file.
+
 Thu Nov  2 23:19:20 2000  Mark P Mitchell  <mark@codesourcery.com>
 
 	* include/c/bits/std_cctype.h: Undefine macros that conflict
diff --git a/libstdc++-v3/include/c/bits/std_cwchar.h b/libstdc++-v3/include/c/bits/std_cwchar.h
index cc769402c53..3e0a75ee904 100644
--- a/libstdc++-v3/include/c/bits/std_cwchar.h
+++ b/libstdc++-v3/include/c/bits/std_cwchar.h
@@ -44,6 +44,9 @@
 #pragma GCC system_header
 #include_next <wchar.h>
 
+// Get rid of those macros defined in <wchar.h> in lieu of real functions.
+#undef getwchar
+
 namespace std
 {
   using ::wint_t;