bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit d7d919b82f13a257e7faa4b7ac6b3e2f0a9685a4
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Apr 30 14:11:19 2014 +0300
Fix compilation error against OS X SDK 10.9
Despite what the comment says, it seems that the declarations *must*
match the ones in the SDK's cxxabi.h. (Why do we need our own
declarations at all then? I am not entirely sure.)
Change-Id: I32c2bed69816dc5fd0a20afe04c5a9045ee70dc1
(cherry picked from commit 77cfb8478c8e8058bb43e92fa18c47411e11b2cf)
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
b/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
index aaf83a2..49c7db5 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
@@ -139,10 +139,17 @@ namespace CPPU_CURRENT_NAMESPACE
// complain about redeclarations of these somewhat implicitly declared
// functions):
#if __GNUC__ == 4 && __GNUC_MINOR__ <= 6
+
+#if defined __clang__ && MACOSX_SDK_VERSION >= 1090
+#define CXA_THROW_TINFO_TYPE std::type_info *
+#else
+#define CXA_THROW_TINFO_TYPE void *
+#endif
+
extern "C" void *__cxa_allocate_exception(
std::size_t thrown_size ) throw();
extern "C" void __cxa_throw (
- void *thrown_exception, void *tinfo, void (*dest) (void *) )
__attribute__((noreturn));
+ void *thrown_exception, CXA_THROW_TINFO_TYPE tinfo, void (*dest) (void *)
) __attribute__((noreturn));
#endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
