From 8976d67f50e3a79f94b324ff3fdb20b3a8665190 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 13 May 2026 16:44:24 -0500 Subject: [PATCH] vcl/osx: work around "UInt" name conflict between macOS and Qt6 qdebug.h defines UInt but so do some Mac kernel headers. Change-Id: I9f2885035129c47f77c3a6c61250026f000135bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/207982 Reviewed-by: Michael Weghorn Tested-by: Jenkins Reviewed-by: Dan Williams --- include/postmac.h | 1 + include/premac.h | 1 + 2 files changed, 2 insertions(+) diff --git a/include/postmac.h b/include/postmac.h index bfeb88dfd34c..1108c685ab23 100644 --- a/include/postmac.h +++ b/include/postmac.h @@ -21,5 +21,6 @@ #undef Size #undef TimeValue #undef TimeRecord +#undef UInt /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/premac.h b/include/premac.h index 5a2707d19617..dc76edade8a4 100644 --- a/include/premac.h +++ b/include/premac.h @@ -21,5 +21,6 @@ #define Size MacOSSize #define TimeValue MacOSTimeValue #define TimeRecord MacOSTimeRecord +#define UInt MacOSUInt /* vim:set shiftwidth=4 softtabstop=4 expandtab: */