diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2000-11-03 06:20:17 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2000-11-03 06:20:17 +0000 |
| commit | 11d6fb5451edf66542a7052bb8973e42ddfb7dbf (patch) | |
| tree | 27f73115701f448b6083e001bf8eca98f641b109 | |
| parent | 6c6a14b5fc3a2f7267358d4f3eaa3232f4039180 (diff) | |
| download | gcc-11d6fb5451edf66542a7052bb8973e42ddfb7dbf.zip gcc-11d6fb5451edf66542a7052bb8973e42ddfb7dbf.tar.gz gcc-11d6fb5451edf66542a7052bb8973e42ddfb7dbf.tar.bz2 | |
std_cctype.h: Undefine macros that conflict with function names defined in this file.
* include/c/bits/std_cctype.h: Undefine macros that conflict
with function names defined in this file.
* include/c/bits/std_cstdio.h: Likewise.
From-SVN: r37221
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/c/bits/std_cctype.h | 16 | ||||
| -rw-r--r-- | libstdc++-v3/include/c/bits/std_cstdio.h | 10 |
3 files changed, 32 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 06f15b3..1778125 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +Thu Nov 2 23:19:20 2000 Mark P Mitchell <mark@codesourcery.com> + + * include/c/bits/std_cctype.h: Undefine macros that conflict + with function names defined in this file. + * include/c/bits/std_cstdio.h: Likewise. + 2000-11-02 Mark Mitchell <mark@codesourcery.com> * acinclude.m4 (GLIBCPP_CHECK_CTYPE_SUPPORT): Fix typo. diff --git a/libstdc++-v3/include/c/bits/std_cctype.h b/libstdc++-v3/include/c/bits/std_cctype.h index bb50610..0fcbb74 100644 --- a/libstdc++-v3/include/c/bits/std_cctype.h +++ b/libstdc++-v3/include/c/bits/std_cctype.h @@ -41,6 +41,22 @@ #pragma GCC system_header #include_next <ctype.h> +// Get rid of those macros defined in <ctype.h> in lieu of real functions. +#undef isalnum +#undef isalpha +#undef isblank +#undef iscntrl +#undef isdigit +#undef isgraph +#undef islower +#undef isprint +#undef ispunct +#undef isspace +#undef isupper +#undef isxdigit +#undef tolower +#undef toupper + namespace std { extern "C" int isalnum(int __c); diff --git a/libstdc++-v3/include/c/bits/std_cstdio.h b/libstdc++-v3/include/c/bits/std_cstdio.h index b583624..dc59031 100644 --- a/libstdc++-v3/include/c/bits/std_cstdio.h +++ b/libstdc++-v3/include/c/bits/std_cstdio.h @@ -41,6 +41,16 @@ #pragma GCC system_header #include_next <stdio.h> +// Get rid of those macros defined in <stdio.h> in lieu of real functions. +#undef clearerr +#undef feof +#undef ferror +#undef fileno +#undef getc +#undef getchar +#undef putc +#undef putchar + namespace std { using ::FILE; |