Commit c30432e5 authored by Felix Paul Kühne's avatar Felix Paul Kühne

Be sure to declare NSInteger if it isn't present

parent 76d3144d
...@@ -37,6 +37,12 @@ ...@@ -37,6 +37,12 @@
#include <Cocoa/Cocoa.h> #include <Cocoa/Cocoa.h>
/* this was introduced in Darwin 9. We need to declare it to prevent both
* compilation warnings and errors */
#ifndef NSInteger
#define NSInteger int
#endif
/***************************************************************************** /*****************************************************************************
* Local prototypes. * Local prototypes.
*****************************************************************************/ *****************************************************************************/
......
...@@ -431,7 +431,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; ...@@ -431,7 +431,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
[o_video_device_pop addItemWithTitle: [o_video_device_pop addItemWithTitle:
[NSString stringWithFormat: @"%@ %i (%ix%i)", _NS("Screen"), i+1, [NSString stringWithFormat: @"%@ %i (%ix%i)", _NS("Screen"), i+1,
(int)s_rect.size.width, (int)s_rect.size.height]]; (int)s_rect.size.width, (int)s_rect.size.height]];
[[o_video_device_pop lastItem] setTag: [[[NSScreen screens] objectAtIndex: i] displayID]]; [[o_video_device_pop lastItem] setTag: (int)[[[NSScreen screens] objectAtIndex: i] displayID]];
i++; i++;
} }
[o_video_device_pop selectItemAtIndex: 0]; [o_video_device_pop selectItemAtIndex: 0];
...@@ -1146,12 +1146,12 @@ static VLCSimplePrefs *_o_sharedInstance = nil; ...@@ -1146,12 +1146,12 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
[self showSettingsForCategory: o_hotkeys_view]; [self showSettingsForCategory: o_hotkeys_view];
} }
- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView - (int)numberOfRowsInTableView:(NSTableView *)aTableView
{ {
return [o_hotkeySettings count]; return [o_hotkeySettings count];
} }
- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
{ {
if( [[aTableColumn identifier] isEqualToString: @"action"] ) if( [[aTableColumn identifier] isEqualToString: @"action"] )
return [o_hotkeyDescriptions objectAtIndex: rowIndex]; return [o_hotkeyDescriptions objectAtIndex: rowIndex];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment