summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Slimber/Cocoa/CocoaController.h')
-rw-r--r--Slimber/Cocoa/CocoaController.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Slimber/Cocoa/CocoaController.h b/Slimber/Cocoa/CocoaController.h
index 8f42fbf..f6881ae 100644
--- a/Slimber/Cocoa/CocoaController.h
+++ b/Slimber/Cocoa/CocoaController.h
@@ -1,13 +1,13 @@
1/* 1/*
2 * Copyright (c) 2010-2012 Isode Limited. 2 * Copyright (c) 2010-2015 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
6 6
7// Fix Boost-Cocoa conflict 7#pragma once
8#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0 8
9#include <Cocoa/Cocoa.h> 9#include <Cocoa/Cocoa.h>
10 10
11class MainController; 11class MainController;
12class CocoaMenulet; 12class CocoaMenulet;
13 13