cxxabi.h (__cxa_atexit): Conditionalize exception specification on #ifdef __cplusplus.

	* libsupc++/cxxabi.h (__cxa_atexit): Conditionalize exception
	specification on #ifdef __cplusplus.

From-SVN: r124456

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 70d304c7aca50e9a8948f57e421c309f08165ada..c2641634d087e8d226cd43735a419fbe13bddb94 100644 (file)
--- 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 fb082d32ac2d8809c22f8592f165f05af9c6f62e..9e8a9107b799648448c609ace2a430520e4327b8 100644 (file)
--- 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*);