diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index bff4008ab34..27142f3efae 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2013-06-24 Bernd Edlinger + + PR libstdc++/57691 + * include/c_global/cstdlib (atexit, at_quick_exit): If !_GLIBCC_HOSTED, + declare per the letter of the C++ standard in terms of void. + * include/c_std/cstdlib: Likewise. + 2013-06-22 Paolo Carlini PR libstdc++/57674 diff --git a/libstdc++-v3/include/c_global/cstdlib b/libstdc++-v3/include/c_global/cstdlib index 9180036e634..0ae28c67b06 100644 --- a/libstdc++-v3/include/c_global/cstdlib +++ b/libstdc++-v3/include/c_global/cstdlib @@ -55,11 +55,11 @@ namespace std { extern "C" void abort(void) throw () _GLIBCXX_NORETURN; - extern "C" int atexit(void (*)()) throw (); + extern "C" int atexit(void (*)(void)) throw (); extern "C" void exit(int) throw () _GLIBCXX_NORETURN; #if __cplusplus >= 201103L # ifdef _GLIBCXX_HAVE_AT_QUICK_EXIT - extern "C" int at_quick_exit(void (*)()) throw (); + extern "C" int at_quick_exit(void (*)(void)) throw (); # endif # ifdef _GLIBCXX_HAVE_QUICK_EXIT extern "C" void quick_exit(int) throw() _GLIBCXX_NORETURN; diff --git a/libstdc++-v3/include/c_std/cstdlib b/libstdc++-v3/include/c_std/cstdlib index fa3e0ead977..ab7b030da86 100644 --- a/libstdc++-v3/include/c_std/cstdlib +++ b/libstdc++-v3/include/c_std/cstdlib @@ -55,11 +55,11 @@ namespace std { extern "C" void abort(void) throw () _GLIBCXX_NORETURN; - extern "C" int atexit(void (*)()) throw (); + extern "C" int atexit(void (*)(void)) throw (); extern "C" void exit(int) throw () _GLIBCXX_NORETURN; #if __cplusplus >= 201103L # ifdef _GLIBCXX_HAVE_AT_QUICK_EXIT - extern "C" int at_quick_exit(void (*)()) throw (); + extern "C" int at_quick_exit(void (*)(void)) throw (); # endif # ifdef _GLIBCXX_HAVE_QUICK_EXIT extern "C" void quick_exit(int) throw() _GLIBCXX_NORETURN;