diff options
| author | Tor Lillqvist <tml@collabora.com> | 2023-04-20 17:43:03 +0300 |
|---|---|---|
| committer | Aron Budea <aron.budea@collabora.com> | 2023-06-20 01:29:35 +0200 |
| commit | 32b334d57970e515141a0d5b1488e72a8f3f6fd6 (patch) | |
| tree | 467ae90d12ef283c2deb7a151c4f7464454dc215 | |
| parent | Accept iOS SDK 16.5 (diff) | |
| download | core-32b334d57970e515141a0d5b1488e72a8f3f6fd6.tar.gz core-32b334d57970e515141a0d5b1488e72a8f3f6fd6.zip | |
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 <plubius@neooffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150711
(cherry picked from commit c3f181fd2ff02bd4aeabd151e2fd79e38fa81331)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153305
Tested-by: Aron Budea <aron.budea@collabora.com>
Reviewed-by: Aron Budea <aron.budea@collabora.com>
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h | 2 |
1 files changed, 2 insertions, 0 deletions
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) |