From 7115d32a362ccb1eb74ebe024549c46468d52b70 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Fri, 1 Nov 2013 11:10:55 +0000 Subject: [PATCH] re PR libstdc++/58952 (Construct "std::getchar()" rejected when getchar is macro in C library) 2013-11-01 Paolo Carlini PR libstdc++/58952 * include/c_global/cstdio: Undef getchar. From-SVN: r204291 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/c_global/cstdio | 1 + 2 files changed, 6 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 40d48794e21..4b3ad1a8b2a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2013-11-01 Paolo Carlini + + PR libstdc++/58952 + * include/c_global/cstdio: Undef getchar. + 2013-11-01 Jonathan Wakely N3421 C++1y Transparent functors diff --git a/libstdc++-v3/include/c_global/cstdio b/libstdc++-v3/include/c_global/cstdio index 699a0766782..b5660737776 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 -- 2.30.2