summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Slimber/Cocoa/CocoaController.h')
-rw-r--r--Slimber/Cocoa/CocoaController.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/Slimber/Cocoa/CocoaController.h b/Slimber/Cocoa/CocoaController.h
index 27542c6..24070c6 100644
--- a/Slimber/Cocoa/CocoaController.h
+++ b/Slimber/Cocoa/CocoaController.h
@@ -1,9 +1,11 @@
/*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2012 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
*/
+// Fix Boost-Cocoa conflict
+#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
#include <Cocoa/Cocoa.h>
class MainController;