Revert "Xcode 5 fixing, part 1."

This reverts commit bfab952b6a.
This commit is contained in:
Jason Felds
2013-11-06 23:33:31 -05:00
parent bfab952b6a
commit 09f8219a67
7 changed files with 21 additions and 13 deletions
+4 -3
View File
@@ -223,10 +223,11 @@ void ArchHooks_MacOSX::DumpDebugInfo()
// Get system version
RString sSystemVersion;
{
long major = static_cast<long>(gestaltSystemVersionMajor);
long minor = static_cast<long>(gestaltSystemVersionMinor);
long bugFix = static_cast<long>(gestaltSystemVersionBugFix);
long major = 0, minor = 0, bugFix = 0;
Gestalt( gestaltSystemVersionMajor, &major );
Gestalt( gestaltSystemVersionMinor, &minor );
Gestalt( gestaltSystemVersionBugFix, &bugFix );
if( bugFix )
sSystemVersion = ssprintf( "Mac OS X %ld.%ld.%ld", major, minor, bugFix );
else
@@ -25,7 +25,7 @@ void InputHandler_MacOSX_HID::QueueCallback( void *target, int result, void *ref
IOHIDQueueInterface **queue = (IOHIDQueueInterface **)sender;
IOHIDEventStruct event;
AbsoluteTime zeroTime = { 0, 0 };
HIDDevice *dev = This->m_vDevices[size_t( refcon )];
HIDDevice *dev = This->m_vDevices[int( refcon )];
vector<DeviceInput> vPresses;
while( (result = CALL(queue, getNextEvent, &event, zeroTime, 0)) == kIOReturnSuccess )
@@ -5,7 +5,6 @@
#include "RageLog.h"
#include <Carbon/Carbon.h>
#include <CarbonCore/Files.h>
#include <IOKit/IOKitLib.h>
#include <IOKit/storage/IOMedia.h>
#include <IOKit/usb/USBSpec.h>