diff options
author | Paolo Carlini <paolo.carlini@oracle.com> | 2013-11-01 11:10:55 +0000 |
---|---|---|
committer | Paolo Carlini <paolo@gcc.gnu.org> | 2013-11-01 11:10:55 +0000 |
commit | 7115d32a362ccb1eb74ebe024549c46468d52b70 (patch) | |
tree | ff950e5933805e8b9b09660d1073a4a3c48b9e59 /libstdc++-v3 | |
parent | d081231ab51048230fa2a083178b92d41aa8ac8f (diff) | |
download | gcc-7115d32a362ccb1eb74ebe024549c46468d52b70.zip gcc-7115d32a362ccb1eb74ebe024549c46468d52b70.tar.gz gcc-7115d32a362ccb1eb74ebe024549c46468d52b70.tar.bz2 |
re PR libstdc++/58952 (Construct "std::getchar()" rejected when getchar is macro in C library)
2013-11-01 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/58952
* include/c_global/cstdio: Undef getchar.
From-SVN: r204291
Diffstat (limited to 'libstdc++-v3')
-rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
-rw-r--r-- | libstdc++-v3/include/c_global/cstdio | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 40d48794..4b3ad1a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2013-11-01 Paolo Carlini <paolo.carlini@oracle.com> + + PR libstdc++/58952 + * include/c_global/cstdio: Undef getchar. + 2013-11-01 Jonathan Wakely <jwakely.gcc@gmail.com> N3421 C++1y Transparent functors diff --git a/libstdc++-v3/include/c_global/cstdio b/libstdc++-v3/include/c_global/cstdio index 699a076..b566073 100644 --- a/libstdc++-v3/include/c_global/cstdio +++ b/libstdc++-v3/include/c_global/cstdio @@ -69,6 +69,7 @@ extern "C" char* gets (char* __s) __attribute__((deprecated)); #undef ftell #undef fwrite #undef getc +#undef getchar #if __cplusplus <= 201103L # undef gets #endif |