From da7d7a0ca71b80281aa9ff2526290b61ccb0cc60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sun, 23 Dec 2012 15:09:28 +0100
Subject: Fix Cocoa-Boost conflict.

This one only seems to appear when using CLang.

Change-Id: Ib12fbeb3da0dfb54aef0613c7b9eba577654cd6a

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;
diff --git a/Slimber/Cocoa/CocoaMenulet.h b/Slimber/Cocoa/CocoaMenulet.h
index 5c7c33e..0edceea 100644
--- a/Slimber/Cocoa/CocoaMenulet.h
+++ b/Slimber/Cocoa/CocoaMenulet.h
@@ -1,11 +1,13 @@
 /*
- * 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.
  */
 
 #pragma once
 
+// Fix Boost-Cocoa conflict
+#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
 #include <Cocoa/Cocoa.h>
 
 #include "Slimber/Menulet.h"
-- 
cgit v0.10.2-6-g49f6