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 17781253f7771957ce2aaa8452ff96fd3a607b6a..e14ac9746253f221fb123e7b184e5491df51db14 100644 (file)
--- 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 cc769402c53f92a5343b69295c3adb80bf9d27d3..3e0a75ee904f9aa7d39dba296fb6a875b672d7f7 100644 (file)
--- 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;