Swiftdiff options
| -rw-r--r-- | SwifTools/Dock/MacOSXDock.mm | 3 | ||||
| -rw-r--r-- | Swiften/EventLoop/EventLoop.cpp | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/SwifTools/Dock/MacOSXDock.mm b/SwifTools/Dock/MacOSXDock.mm index b8374fa..3164998 100644 --- a/SwifTools/Dock/MacOSXDock.mm +++ b/SwifTools/Dock/MacOSXDock.mm @@ -1,3 +1,6 @@ +// Fix Boost-Cocoa conflict +#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0 + #include <SwifTools/Dock/MacOSXDock.h> #include <AppKit/AppKit.h> diff --git a/Swiften/EventLoop/EventLoop.cpp b/Swiften/EventLoop/EventLoop.cpp index 88d8d54..014b81f 100644 --- a/Swiften/EventLoop/EventLoop.cpp +++ b/Swiften/EventLoop/EventLoop.cpp @@ -10,6 +10,7 @@ #include <boost/bind.hpp> #include <iostream> #include <cassert> +#include <boost/thread/locks.hpp> #include <Swiften/Base/Log.h> #include <boost/thread/locks.hpp> |