diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-02-19 03:58:03 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-02-19 03:58:03 +0000 |
| commit | 7e251ead609170f2fde48d2805983d5aee0c45c5 (patch) | |
| tree | b9f47cc5039ba6a2095c4e65efade5ccc3ecd5ed | |
| parent | 9aa46ba6283a04f35b0b6817a19d866acc40ae68 (diff) | |
| download | pcsxr-7e251ead609170f2fde48d2805983d5aee0c45c5.tar.gz | |
-NSInteger is 64-bit on x86_64 so use long instead (cannot test for now, use previous revisions if broken).
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@63552 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rw-r--r-- | macosx/PcsxPlugin.h | 2 | ||||
| -rw-r--r-- | macosx/PcsxPlugin.m | 2 | ||||
| -rw-r--r-- | macosx/plugins/DFInput/macsrc/MappingCell.m | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/macosx/PcsxPlugin.h b/macosx/PcsxPlugin.h index 02f9484b..6fd2d85b 100644 --- a/macosx/PcsxPlugin.h +++ b/macosx/PcsxPlugin.h @@ -29,7 +29,7 @@ - (NSString *)getDisplayVersion; - (int)getType; - (NSString *)path; -- (unsigned int)hash; +- (unsigned long)hash; - (NSString *)description; - (BOOL)hasAboutAs:(int)type; - (BOOL)hasConfigureAs:(int)type; diff --git a/macosx/PcsxPlugin.m b/macosx/PcsxPlugin.m index 20e3a8e7..87cfbe6f 100644 --- a/macosx/PcsxPlugin.m +++ b/macosx/PcsxPlugin.m @@ -274,7 +274,7 @@ return path; } -- (unsigned int)hash +- (unsigned long)hash { return [path hash]; } diff --git a/macosx/plugins/DFInput/macsrc/MappingCell.m b/macosx/plugins/DFInput/macsrc/MappingCell.m index 0fb43bd1..2a382436 100644 --- a/macosx/plugins/DFInput/macsrc/MappingCell.m +++ b/macosx/plugins/DFInput/macsrc/MappingCell.m @@ -31,13 +31,13 @@ return self; } -- (void)selectWithFrame:(NSRect)aRect inView:(NSView *)controlView editor:(NSText *)textObj delegate:(id)anObject start:(int)selStart length:(int)selLength +- (void)selectWithFrame:(NSRect)aRect inView:(NSView *)controlView editor:(NSText *)textObj delegate:(id)anObject start:(long)selStart length:(long)selLength { [super selectWithFrame:aRect inView:controlView editor:textObj delegate:anObject start:selStart length:selLength]; - int whichPad = [ControllerList currentController]; + long whichPad = [ControllerList currentController]; NSTableView *tableView = (NSTableView *)[self controlView]; - int i, changed = 0, row; + long i, changed = 0, row; NSEvent *endEvent; NSPoint where = {0.0, 0.0}; |