]> gcc.gnu.org Git - gcc.git/commitdiff
libstdc++: Avoid conflicting declaration in eh_call.cc [PR112997]
authorJonathan Wakely <jwakely@redhat.com>
Wed, 13 Dec 2023 09:45:44 +0000 (09:45 +0000)
committerJonathan Wakely <jwakely@redhat.com>
Sun, 7 Jan 2024 00:58:46 +0000 (00:58 +0000)
r14-1527-g2415024e0f81f8 changed the parameter of the
__cxa_call_terminate definition, but there's also a declaration in
unwind-cxx.h which should have been changed too.

libstdc++-v3/ChangeLog:

PR libstdc++/112997
* libsupc++/unwind-cxx.h (__cxa_call_terminate): Change first
parameter to void*.

libstdc++-v3/libsupc++/unwind-cxx.h

index f7eef0da6e255a00ef16baab42451c88cbc01c62..abc8b808f26720f6992f05141a4f2ad803534d44 100644 (file)
@@ -167,7 +167,7 @@ struct __cxa_eh_globals
 // throws, and if bad_exception needs to be thrown.  Called from the
 // compiler.
 extern "C" void __cxa_call_unexpected (void *) __attribute__((__noreturn__));
-extern "C" void __cxa_call_terminate (_Unwind_Exception*) throw ()
+extern "C" void __cxa_call_terminate (void*) throw ()
   __attribute__((__noreturn__));
 
 #ifdef __ARM_EABI_UNWINDER__
This page took 0.062525 seconds and 5 git commands to generate.