Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2013-08-16 10:00:46 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2013-08-16 10:04:00 (GMT) |
| commit | ee8a386eab3a2d061ff91e22798b7251ca3f05ae (patch) | |
| tree | 963d2c194ac7a3c52912f4e8fac1bd0da32d39f8 | |
| parent | 1c1056b42d092f943735a1fe033f295ac5b27a77 (diff) | |
| parent | e4a3c018fe824c0c402dbc3167a113276fbe6e4e (diff) | |
| download | swift-ee8a386eab3a2d061ff91e22798b7251ca3f05ae.zip swift-ee8a386eab3a2d061ff91e22798b7251ca3f05ae.tar.bz2 | |
Merge branch 'swift-2.x'
Change-Id: I36e82dfe1ec492df719bcc85e5549fb4013a6723
| -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> |