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 <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit ec082fdea6243d71cdfeef7562812f332911f288) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
3cc4b5725a
commit
2442be2918
@ -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)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user