From ea582cdcbf8c5b94f9baf5bffdbedc622d39ed9f Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 15 Jun 2016 13:57:23 -0700 Subject: Work around Apple defining "check" The header says they'll stop doing that in the next release. It's been like that since at least the OS X 10.8 SDK... Change-Id: Ib57b52598e2f452985e9fffd14585d4838dc8b09 Reviewed-by: Richard J. Moore --- src/corelib/kernel/qeventdispatcher_unix_p.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h index df080809b6..32c9de03fa 100644 --- a/src/corelib/kernel/qeventdispatcher_unix_p.h +++ b/src/corelib/kernel/qeventdispatcher_unix_p.h @@ -84,6 +84,11 @@ public: }; +#ifdef check +// defined in Apple's /usr/include/AssertMacros.h header +# undef check +#endif + class QEventDispatcherUNIXPrivate; #ifdef Q_OS_QNX -- cgit v1.2.3