diff options
| author | Manolo Gouy <Manolo> | 2015-06-30 02:23:26 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2015-06-30 02:23:26 +0000 |
| commit | 634ede015d20cd2f031551571a0ea049e594fecc (patch) | |
| tree | 50f3d62fbd9845481f942e65246fc74724fade22 | |
| parent | b4662e4f449ba7ad5afd3ec471601798baf0ddaf (diff) | |
Define NSInteger in FL/mac.H when needed, so it's available to all source files.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10779 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/mac.H | 10 | ||||
| -rw-r--r-- | src/Fl_Native_File_Chooser_MAC.mm | 4 | ||||
| -rw-r--r-- | src/Fl_Sys_Menu_Bar.mm | 10 | ||||
| -rw-r--r-- | src/Fl_cocoa.mm | 11 |
4 files changed, 10 insertions, 25 deletions
@@ -72,6 +72,16 @@ typedef CGContextRef Fl_Offscreen; #define MAC_OS_X_VERSION_10_10 101000 #endif +#ifndef NSINTEGER_DEFINED // appears with 10.5 in NSObjCRuntime.h +#if defined(__LP64__) && __LP64__ +typedef long NSInteger; +typedef unsigned long NSUInteger; +#else +typedef int NSInteger; +typedef unsigned int NSUInteger; +#endif +#endif + #ifdef __OBJC__ @class NSCursor; @class NSOpenGLPixelFormat; diff --git a/src/Fl_Native_File_Chooser_MAC.mm b/src/Fl_Native_File_Chooser_MAC.mm index 3b1b402d3..d09024d70 100644 --- a/src/Fl_Native_File_Chooser_MAC.mm +++ b/src/Fl_Native_File_Chooser_MAC.mm @@ -532,11 +532,7 @@ int Fl_Native_File_Chooser::runmodal() NSString *dir = nil; NSString *fname = nil; NSString *preset = nil; -#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 - int retval; -#else NSInteger retval; -#endif if (_preset_file) { preset = [[NSString alloc] initWithUTF8String:_preset_file]; if (strchr(_preset_file, '/') != NULL) { diff --git a/src/Fl_Sys_Menu_Bar.mm b/src/Fl_Sys_Menu_Bar.mm index fc0576795..8dfb2035a 100644 --- a/src/Fl_Sys_Menu_Bar.mm +++ b/src/Fl_Sys_Menu_Bar.mm @@ -40,16 +40,6 @@ #import <Cocoa/Cocoa.h> -#ifndef NSINTEGER_DEFINED // appears with 10.5 in NSObjCRuntime.h -#if defined(__LP64__) && __LP64__ -typedef long NSInteger; -typedef unsigned long NSUInteger; -#else -typedef long NSInteger; -typedef unsigned int NSUInteger; -#endif -#endif - #include "flstring.h" #include <stdio.h> #include <ctype.h> diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 74607c7df..eb85f7125 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -53,17 +53,6 @@ extern "C" { #import <Cocoa/Cocoa.h> -#ifndef NSINTEGER_DEFINED // appears with 10.5 in NSObjCRuntime.h -#if defined(__LP64__) && __LP64__ -typedef long NSInteger; -typedef unsigned long NSUInteger; -#else -typedef long NSInteger; -typedef unsigned int NSUInteger; -#endif -#endif - - // #define DEBUG_SELECT // UNCOMMENT FOR SELECT()/THREAD DEBUGGING #ifdef DEBUG_SELECT #include <stdio.h> // testing |