diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-02-25 20:27:59 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-02-26 08:57:07 +0100 |
| commit | 128deeae81a6f802bfb79b8f0fa8c4b10729f7db (patch) | |
| tree | dbf0f693609d17fee8c011c9e684e746cf53b408 /bridges | |
| parent | baad027bb7d4e4cd3c80ec3051741d21a8d23511 (diff) | |
cxxabi.h is not specific to GCC
Change-Id: Icaf4d4d41a36ae469f826ac08ab641a554dff3c9
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_intel/share.hxx | 8 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx index bf9c501013fb..f97e81e419eb 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx @@ -29,7 +29,7 @@ #endif #include <unwind.h> -#include "config_gcc.h" +#include "config_cxxabi.h" #include <uno/any2.h> #include "uno/mapping.h" @@ -80,17 +80,17 @@ struct __cxa_eh_globals // __cxa_allocate_exception and __cxa_throw, though they do not have the // additional problem of an incompletely declared return type: -#if !HAVE_GCC_CXXABI_H_CXA_GET_GLOBALS +#if !HAVE_CXXABI_H_CXA_GET_GLOBALS namespace __cxxabiv1 { extern "C" void * __cxa_get_globals() throw(); } #endif -#if !HAVE_GCC_CXXABI_H_CXA_ALLOCATE_EXCEPTION +#if !HAVE_CXXABI_H_CXA_ALLOCATE_EXCEPTION namespace __cxxabiv1 { extern "C" void * __cxa_allocate_exception(std::size_t thrown_size) throw(); } #endif -#if !HAVE_GCC_CXXABI_H_CXA_THROW +#if !HAVE_CXXABI_H_CXA_THROW namespace __cxxabiv1 { extern "C" void __cxa_throw( void * thrown_exception, void * tinfo, void (* dest)(void *)) diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx index 096c7d49e81b..19399f35be0a 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx @@ -29,7 +29,7 @@ #endif #include <unwind.h> -#include "config_gcc.h" +#include "config_cxxabi.h" #include "uno/any2.h" #include "uno/mapping.h" @@ -104,17 +104,17 @@ struct __cxa_eh_globals // __cxa_allocate_exception and __cxa_throw, though they do not have the // additional problem of an incompletely declared return type: -#if !HAVE_GCC_CXXABI_H_CXA_GET_GLOBALS +#if !HAVE_CXXABI_H_CXA_GET_GLOBALS namespace __cxxabiv1 { extern "C" void * __cxa_get_globals() throw(); } #endif -#if !HAVE_GCC_CXXABI_H_CXA_ALLOCATE_EXCEPTION +#if !HAVE_CXXABI_H_CXA_ALLOCATE_EXCEPTION namespace __cxxabiv1 { extern "C" void * __cxa_allocate_exception(std::size_t thrown_size) throw(); } #endif -#if !HAVE_GCC_CXXABI_H_CXA_THROW +#if !HAVE_CXXABI_H_CXA_THROW namespace __cxxabiv1 { extern "C" void __cxa_throw( void * thrown_exception, void * tinfo, void (* dest)(void *)) |