diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/cxxabi.h | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 70d304c..c264163 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2007-05-04 Mark Mitchell <mark@codesourcery.com> + + * libsupc++/cxxabi.h (__cxa_atexit): Conditionalize exception + specification on #ifdef __cplusplus. + 2007-05-04 Paolo Carlini <pcarlini@suse.de> * include/bits/stl_memory.h: Rename to stl_auto_ptr.h. @@ -20,6 +25,7 @@ * libsupc++/atexit_arm.cc: New file. * libsupc++/vec.cc (__aeabi_atexit): Remove. * libsupc++/cxxabi.h (__cxa_atexit): Add exception specification. + * libsupc++/Makefile.am: Add atexit_arm.cc. * libsupc++/Makefile.in: Regenerated. diff --git a/libstdc++-v3/libsupc++/cxxabi.h b/libstdc++-v3/libsupc++/cxxabi.h index fb082d3..9e8a910 100644 --- a/libstdc++-v3/libsupc++/cxxabi.h +++ b/libstdc++-v3/libsupc++/cxxabi.h @@ -136,7 +136,11 @@ namespace __cxxabiv1 // DSO destruction. int - __cxa_atexit(void (*)(void*), void*, void*) throw (); + __cxa_atexit(void (*)(void*), void*, void*) +#ifdef __cplusplus + throw () +#endif + ; int __cxa_finalize(void*); |