diff options
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx | 4 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx index ed62f404f439..d17f3d99c629 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx @@ -28,7 +28,9 @@ #include "rtti.hxx" #include "share.hxx" -#include <cxxabi.h> +#ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h +#define _GLIBCXX_CDTOR_CALLABI +#endif using namespace ::std; using namespace ::com::sun::star::uno; 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 6752eeaf6c3d..76d031b29a49 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx @@ -22,9 +22,7 @@ #include <typeinfo> #include <exception> -#ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h -#define _GLIBCXX_CDTOR_CALLABI -#endif +#include <cxxabi.h> // we need this here for _LIBCPPABI_VERSION, etc #include <unwind.h> #include <config_cxxabi.h> |