4 files changed, 7 insertions, 9 deletions
diff --git a/macosx/plugins/DFInput/macsrc/ControllerList.h b/macosx/plugins/DFInput/macsrc/ControllerList.h
index 671c51ff..91320b28 100644
--- a/macosx/plugins/DFInput/macsrc/ControllerList.h
+++ b/macosx/plugins/DFInput/macsrc/ControllerList.h
@@ -34,8 +34,8 @@
 + (void)setCurrentController:(int)which;
 + (int)currentController;
 + (int)getButtonOfRow:(int)row;
-- (int)numberOfRowsInTableView:(NSTableView *)aTableView;
-- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex;
-- (void)deleteRow:(int)which;
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView;
+- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex;
+- (void)deleteRow:(NSInteger)which;
 
 @end
diff --git a/macosx/plugins/DFInput/macsrc/ControllerList.m b/macosx/plugins/DFInput/macsrc/ControllerList.m
index 578898c3..db25d2f2 100644
--- a/macosx/plugins/DFInput/macsrc/ControllerList.m
+++ b/macosx/plugins/DFInput/macsrc/ControllerList.m
@@ -50,7 +50,7 @@ static int currentController;
 }
 
 /* NSDataSource */
-- (int)numberOfRowsInTableView:(NSTableView *)aTableView
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView
 {
 	return DKEY_TOTAL + (g.cfg.PadDef[currentController].Type == PSE_PAD_TYPE_ANALOGPAD ? 8 : -3);
 }
@@ -109,7 +109,7 @@ static const int DPad[DKEY_TOTAL] = {
 }
 
 - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn 
-		row:(int)rowIndex
+		row:(NSInteger)rowIndex
 {
 	char buf[256];
 
@@ -128,7 +128,7 @@ static const int DPad[DKEY_TOTAL] = {
 	}
 }
 
-- (void)deleteRow:(int)which
+- (void)deleteRow:(NSInteger)which
 {
 	if (which < DKEY_TOTAL) {
 		g.cfg.PadDef[currentController].KeyDef[DPad[which]].Key = 0;
diff --git a/macosx/plugins/DFInput/macsrc/PadView.h b/macosx/plugins/DFInput/macsrc/PadView.h
index 1d8d4a09..6e893b1c 100644
--- a/macosx/plugins/DFInput/macsrc/PadView.h
+++ b/macosx/plugins/DFInput/macsrc/PadView.h
@@ -24,8 +24,6 @@
 #import <Cocoa/Cocoa.h>
 #import "ControllerList.h"
 
-@class ControllerList;
-
 @interface PadView : NSView
 {
 	IBOutlet NSTableView *tableView;
diff --git a/macosx/plugins/DFInput/macsrc/PadView.m b/macosx/plugins/DFInput/macsrc/PadView.m
index b0ed273b..e6828e10 100644
--- a/macosx/plugins/DFInput/macsrc/PadView.m
+++ b/macosx/plugins/DFInput/macsrc/PadView.m
@@ -89,7 +89,7 @@
 /* handles key events on the pad list */
 - (void)keyDown:(NSEvent *)theEvent
 {
-	int key = [theEvent keyCode];
+	NSEventType key = [theEvent keyCode];
 
 	if ([[theEvent window] firstResponder] == tableView) {
 		if (key == 51 || key == 117) {