From c614bd718b91ec5560a14ca85bffa5e9a3e78b84 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 18 Dec 2013 20:29:24 -0500
Subject: qt5: fix a build issue with osx and qtdbus

See comment in notificator.cpp for details.
---
 src/qt/notificator.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/qt/notificator.cpp')

diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp
index 1cef397d12..38a029dbe5 100644
--- a/src/qt/notificator.cpp
+++ b/src/qt/notificator.cpp
@@ -14,18 +14,18 @@
 #include <QSystemTrayIcon>
 #include <QTemporaryFile>
 #include <QVariant>
-
-#ifdef Q_OS_MAC
-#include "macnotificationhandler.h"
-
-#include <ApplicationServices/ApplicationServices.h>
-#endif
-
 #ifdef USE_DBUS
 #include <stdint.h>
-
 #include <QtDBus>
 #endif
+// Include ApplicationServices.h after QtDbus to avoid redefinition of check().
+// This affects at least OSX 10.6. See /usr/include/AssertMacros.h for details.
+// Note: This could also be worked around using:
+// #define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
+#ifdef Q_OS_MAC
+#include <ApplicationServices/ApplicationServices.h>
+#include "macnotificationhandler.h"
+#endif
 
 
 // https://wiki.ubuntu.com/NotificationDevelopmentGuidelines recommends at least 128
-- 
cgit v1.2.3