From 677418779023ebd654a3bb4d1032882278fb2030 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Mon, 30 Mar 2015 17:16:28 +0200 Subject: [PATCH] (OSX) Some forward-compatibility build fixes --- apple/OSX/platform.m | 2 ++ apple/OSX/settings.m | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/apple/OSX/platform.m b/apple/OSX/platform.m index f6615853db..70d1a3165f 100644 --- a/apple/OSX/platform.m +++ b/apple/OSX/platform.m @@ -22,6 +22,8 @@ #include "../../menu/menu.h" #include "../../retroarch.h" +#include + static void* const associated_core_key = (void*)&associated_core_key; id apple_platform; diff --git a/apple/OSX/settings.m b/apple/OSX/settings.m index 7ceed5bb4b..2f0a3bcfff 100644 --- a/apple/OSX/settings.m +++ b/apple/OSX/settings.m @@ -23,6 +23,8 @@ #include "../../input/input_common.h" #include "../../input/input_keymaps.h" +#include + static void* const associated_name_tag = (void*)&associated_name_tag; @interface RAInputBinder : NSWindow @@ -209,12 +211,12 @@ NSWindowDelegate> } #pragma mark Section Table -- (int32_t)numberOfRowsInTableView:(NSTableView*)view +- (NSInteger)numberOfRowsInTableView:(NSTableView*)view { return self.settings.count; } -- (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int32_t)row +- (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row { #if defined(MAC_OS_X_VERSION_10_6) return objc_getAssociatedObject([self.settings objectAtIndex:row], associated_name_tag); @@ -231,12 +233,12 @@ NSWindowDelegate> } #pragma mark Setting Outline -- (int32_t)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item +- (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item { return (item == nil) ? [self.currentGroup count] : [item count]; } -- (id)outlineView:(NSOutlineView *)outlineView child:(int32_t)idx ofItem:(id)item +- (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)idx ofItem:(id)item { return (item == nil) ? [self.currentGroup objectAtIndex:idx] : [item objectAtIndex:idx]; }