bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 153263957b22e2d5f76f951366d44c182c22c260
Author:     Tor Lillqvist <t...@collabora.com>
AuthorDate: Thu Apr 20 17:43:03 2023 +0300
Commit:     Tor Lillqvist <t...@collabora.com>
CommitDate: Thu Apr 20 21:35:01 2023 +0200

    Fix compilation with latest Xcode with iOS SDK 16.4
    
    Alternatively we could just remove lots of stuff that we apparently
    don't actually need from this file, including the problematic typedef
    and its uses.
    
    _Unwind_Exception_Class now gets typedeffed in <unwind_itanium.h> as
    uint64_t which effectively is the same as the unsigned
    __attribute__((__mode__(__DI__))) that is used here.
    
    Change-Id: Id96d43eb481ee4ae97dd315aa2fd741e5f627916
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150702
    Reviewed-by: Patrick Luby <plub...@neooffice.org>
    Reviewed-by: Tor Lillqvist <t...@collabora.com>
    Tested-by: Tor Lillqvist <t...@collabora.com>

diff --git a/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h 
b/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h
index 83ed084860fd..aa35a5bc75e6 100644
--- a/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h
+++ b/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h
@@ -46,7 +46,9 @@ typedef unsigned _Unwind_Word 
__attribute__((__mode__(__word__)));
 typedef signed   _Unwind_Sword __attribute__((__mode__(__word__)));
 typedef unsigned _Unwind_Word __attribute__((__mode__(__word__)));
 typedef unsigned _Unwind_Ptr __attribute__((__mode__(__pointer__)));
+#if !defined __IPHONE_16_4 || __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_16_4
 typedef unsigned _Unwind_Exception_Class __attribute__((__mode__(__DI__)));
+#endif
 typedef unsigned _Unwind_Internal_Ptr __attribute__((__mode__(__pointer__)));
 
 #pragma GCC visibility push(default)

Reply via email to