diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-19 23:37:54 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-19 23:38:14 +0100 |
| commit | f5f0758080b0da61e3d2088804cad0b0ed94d21d (patch) | |
| tree | 67a56fa95ef4e5c4c1e3368459c133ced3b4ff66 /bridges/source/cpp_uno/gcc3_linux_intel | |
| parent | 8617010b851e000f336cf647f207557b5eeab8b7 (diff) | |
Revert "hack for now"
This reverts commit f5792667cafef77cc4c142f4261f8b64280bc0fe.
it turns out it was the use of an intermediate GtkGrid which made a11y work
a little differently under gtk3. Clearly not intended to be pushed.
Change-Id: I6931163e07ea413acdd45ba1353f357d317fdfbd
Diffstat (limited to 'bridges/source/cpp_uno/gcc3_linux_intel')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_intel/share.hxx | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx index 512ae6db2c03..f97e81e419eb 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx @@ -27,8 +27,9 @@ #ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h #define _GLIBCXX_CDTOR_CALLABI #endif +#include <unwind.h> -#include "config_gcc.h" +#include "config_cxxabi.h" #include <uno/any2.h> #include "uno/mapping.h" @@ -37,15 +38,7 @@ namespace CPPU_CURRENT_NAMESPACE void dummy_can_throw_anything( char const * ); -// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h - -struct _Unwind_Exception -{ - unsigned exception_class __attribute__((__mode__(__DI__))); - void * exception_cleanup; - unsigned private_1 __attribute__((__mode__(__word__))); - unsigned private_2 __attribute__((__mode__(__word__))); -} __attribute__((__aligned__)); +// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h struct __cxa_exception { @@ -87,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 *)) |