Fix build on Mavericks.

dolphin-emu · Oct 24, 2013 · 005af7b · 005af7b
1 parent 0eba84c
commit 005af7b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm
@@ -1,5 +1,4 @@
 #define BLUETOOTH_VERSION_USE_CURRENT
-#import <IOBluetooth/IOBluetooth.h>
 
 #include "Common.h"
 #include "WiimoteReal.h"

diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteRealBase.h
@@ -8,6 +8,13 @@
 #ifdef _WIN32
 	#include <windows.h>
 #elif defined(__APPLE__)
+	// Work around an Apple bug: for some reason, IOBluetooth.h errors on
+	// inclusion in Mavericks, but only in Objective-C++ C++11 mode.  I filed
+	// this as <rdar://15312520>; in the meantime...
+	#import <Foundation/Foundation.h>
+	#undef NS_ENUM_AVAILABLE
+	#define NS_ENUM_AVAILABLE(...)
+	// end hack
 	#import <IOBluetooth/IOBluetooth.h>
 #elif defined(__linux__) && HAVE_BLUEZ
 	#include <bluetooth/bluetooth.h>