Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-12-23 14:09:28 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2013-08-16 07:43:36 (GMT) |
| commit | 15a27a700945570fe61eddde22e95458ad6e419a (patch) | |
| tree | 069ccd2294b635b1b0008f882d94f6471e6bb24a /SwifTools/Dock | |
| parent | bf6e16ca647c549fab4e6f6fc83ddc87d3ea9bc4 (diff) | |
| download | swift-15a27a700945570fe61eddde22e95458ad6e419a.zip swift-15a27a700945570fe61eddde22e95458ad6e419a.tar.bz2 | |
Fix Cocoa-Boost conflict.
This one only seems to appear when using CLang.
Change-Id: Ib12fbeb3da0dfb54aef0613c7b9eba577654cd6a
Diffstat (limited to 'SwifTools/Dock')
| -rw-r--r-- | SwifTools/Dock/MacOSXDock.mm | 3 |
1 files changed, 3 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> |