diff options
| author | David Edelsohn <edelsohn@gnu.org> | 2000-11-03 23:01:19 +0000 |
|---|---|---|
| committer | David Edelsohn <dje@gcc.gnu.org> | 2000-11-03 18:01:19 -0500 |
| commit | 50149aa9f99b60391899f18062a84ecb533cfd34 (patch) | |
| tree | 17ba355e128e0b7d67f17c134a6a981372bf09d3 | |
| parent | 0e9295cf741f6e6a6ed3bfe0d419002ec867dbc7 (diff) | |
| download | gcc-50149aa9f99b60391899f18062a84ecb533cfd34.zip gcc-50149aa9f99b60391899f18062a84ecb533cfd34.tar.gz gcc-50149aa9f99b60391899f18062a84ecb533cfd34.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/c/bits/std_cwchar.h | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1778125..e14ac97 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 cc76940..3e0a75e 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; |