From a26f744c983a601be5e9e4176ba0325d4aaf8200 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Wed, 11 Aug 2010 20:53:19 +0000 Subject: [PATCH] UpdateSystemActivity() is defined in OSServices/Power.h which is erroneously #ifndef _LP64 in the 10.5 SDK. Since OSServices is a sub-framework of the CoreServices, Power.h cannot be included directly without specifying the long and messy path to it. Just declare it extern here as well instead. Don't disable dynamic updating of the bluetooth device name as it would then be printed as (null) on the first pairing of a wiimote. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6091 8ced0084-cf51-0410-be5f-012b33b47a6e --- Externals/WiiUse/Src/io_osx.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Externals/WiiUse/Src/io_osx.m b/Externals/WiiUse/Src/io_osx.m index 8e30ed27b3..d22a2956cc 100644 --- a/Externals/WiiUse/Src/io_osx.m +++ b/Externals/WiiUse/Src/io_osx.m @@ -32,6 +32,7 @@ */ #import +extern OSErr UpdateSystemActivity(UInt8 activity); #define BLUETOOTH_VERSION_USE_CURRENT #import #import @@ -115,7 +116,7 @@ volatile int reader, writer, outstanding, watermark; CFRunLoopStop(CFRunLoopGetCurrent()); - UpdateSystemActivity(UsrActivity); + UpdateSystemActivity(1); } - (void) l2capChannelClosed: (IOBluetoothL2CAPChannel *) l2capChannel @@ -175,7 +176,6 @@ int wiiuse_find(struct wiimote_t **wm, int max_wiimotes, int timeout) majorDeviceClass: kBluetoothDeviceClassMajorPeripheral minorDeviceClass: kBluetoothDeviceClassMinorPeripheral2Joystick ]; - [bti setUpdateNewDeviceNames: NO]; IOReturn ret = [bti start]; if (ret == kIOReturnSuccess)