Swiftdiff options
Diffstat (limited to 'Slimber/Cocoa/CocoaController.h')
| -rw-r--r-- | Slimber/Cocoa/CocoaController.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Slimber/Cocoa/CocoaController.h b/Slimber/Cocoa/CocoaController.h index 27542c6..c8287b7 100644 --- a/Slimber/Cocoa/CocoaController.h +++ b/Slimber/Cocoa/CocoaController.h @@ -1,8 +1,10 @@ /* - * 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> @@ -10,8 +12,5 @@ class MainController; class CocoaMenulet; -@interface CocoaController : NSObject { - CocoaMenulet* menulet; - MainController* main; -} +@interface CocoaController : NSObject @end |