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
This commit is contained in:
Soren Jorvang 2010-08-11 20:53:19 +00:00
parent df8ffa69bb
commit a26f744c98
1 changed files with 2 additions and 2 deletions

View File

@ -32,6 +32,7 @@
*/
#import <CoreServices/CoreServices.h>
extern OSErr UpdateSystemActivity(UInt8 activity);
#define BLUETOOTH_VERSION_USE_CURRENT
#import <IOBluetooth/objc/IOBluetoothDevice.h>
#import <IOBluetooth/objc/IOBluetoothDeviceInquiry.h>
@ -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)