pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed build warnings on Intel Mac

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401413
This commit is contained in:
Sam Lantinga 2006-02-21 19:24:09 +00:00
parent 0487d9cfe1
commit 6d2f939f1b
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/joystick/darwin/SDL_sysjoystick.c
View file

@ -585,15 +585,15 @@ static recDevice *HIDDisposeDevice (recDevice **ppDevice)
int SDL_SYS_JoystickInit(void) int SDL_SYS_JoystickInit(void)
{ {
IOReturn result = kIOReturnSuccess; IOReturn result = kIOReturnSuccess;
mach_port_t masterPort = NULL; mach_port_t masterPort = 0;
io_iterator_t hidObjectIterator = NULL; io_iterator_t hidObjectIterator = 0;
CFMutableDictionaryRef hidMatchDictionary = NULL; CFMutableDictionaryRef hidMatchDictionary = NULL;
recDevice *device, *lastDevice; recDevice *device, *lastDevice;
io_object_t ioHIDDeviceObject = NULL; io_object_t ioHIDDeviceObject = 0;
SDL_numjoysticks = 0; SDL_numjoysticks = 0;
if (NULL != gpDeviceList) if (!gpDeviceList)
{ {
SDL_SetError("Joystick: Device list already inited."); SDL_SetError("Joystick: Device list already inited.");
return -1; return -1;
@ -608,7 +608,7 @@ int SDL_SYS_JoystickInit(void)
/* Set up a matching dictionary to search I/O Registry by class name for all HID class devices. */ /* Set up a matching dictionary to search I/O Registry by class name for all HID class devices. */
hidMatchDictionary = IOServiceMatching (kIOHIDDeviceKey); hidMatchDictionary = IOServiceMatching (kIOHIDDeviceKey);
if ((hidMatchDictionary != NULL)) if (hidMatchDictionary)
{ {
/* Add key for device type (joystick, in this case) to refine the matching dictionary. */ /* Add key for device type (joystick, in this case) to refine the matching dictionary. */
@ -637,7 +637,7 @@ int SDL_SYS_JoystickInit(void)
SDL_SetError("Joystick: Couldn't create a HID object iterator."); SDL_SetError("Joystick: Couldn't create a HID object iterator.");
return -1; return -1;
} }
if (NULL == hidObjectIterator) /* there are no joysticks */ if (!hidObjectIterator) /* there are no joysticks */
{ {
gpDeviceList = NULL; gpDeviceList = NULL;
SDL_numjoysticks = 0; SDL_numjoysticks = 0;