From 50149aa9f99b60391899f18062a84ecb533cfd34 Mon Sep 17 00:00:00 2001 From: David Edelsohn Date: Fri, 3 Nov 2000 23:01:19 +0000 Subject: [PATCH] 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 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/c/bits/std_cwchar.h | 3 +++ 2 files changed, 8 insertions(+) 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 + + * 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 * 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 +// Get rid of those macros defined in in lieu of real functions. +#undef getwchar + namespace std { using ::wint_t; -- 2.30.2