Xcode 5 fixing, part 1.

Need someone on xcode 4.x to confirm this works.

Once this file gets fixed, the others will be removed.
This commit is contained in:
Jason Felds
2013-11-04 19:45:23 -05:00
parent 4298f2542d
commit bfab952b6a
7 changed files with 13 additions and 21 deletions
+3 -4
View File
@@ -223,11 +223,10 @@ void ArchHooks_MacOSX::DumpDebugInfo()
// Get system version
RString sSystemVersion;
{
long major = 0, minor = 0, bugFix = 0;
long major = static_cast<long>(gestaltSystemVersionMajor);
long minor = static_cast<long>(gestaltSystemVersionMinor);
long bugFix = static_cast<long>(gestaltSystemVersionBugFix);
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[int( refcon )];
HIDDevice *dev = This->m_vDevices[size_t( refcon )];
vector<DeviceInput> vPresses;
while( (result = CALL(queue, getNextEvent, &event, zeroTime, 0)) == kIOReturnSuccess )
@@ -5,6 +5,7 @@
#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>