From 2442be2918856a3a01710d1dd143472032249e03 Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Mon, 20 Feb 2023 12:45:50 +0100 Subject: [PATCH] Fix for a duplicate macro definition ALIGN was conflicting with a system macro, /SDKs/MacOSX13.1.sdk/usr/include/arm/param.h. Task-number: QTBUG-109394 Change-Id: Ia460ee781f8bd1a1cdcff0371efab784c9eebb57 Reviewed-by: Thiago Macieira Reviewed-by: Joerg Bornemann (cherry picked from commit ec082fdea6243d71cdfeef7562812f332911f288) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/kernel/qmetaobjectbuilder.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp index 143880fe985..e61065f42f4 100644 --- a/src/corelib/kernel/qmetaobjectbuilder.cpp +++ b/src/corelib/kernel/qmetaobjectbuilder.cpp @@ -1026,6 +1026,9 @@ int QMetaObjectBuilder::indexOfClassInfo(const QByteArray &name) } // Align on a specific type boundary. +#ifdef ALIGN +# undef ALIGN +#endif #define ALIGN(size,type) \ (size) = ((size) + sizeof(type) - 1) & ~(sizeof(type) - 1)