XQuartz: Check NSINTEGER_DEFINED to make sure the NSInteger and NSUInteger types are defined.
This commit is contained in:
parent
b64310e3a4
commit
36e02a8649
|
@ -45,6 +45,16 @@
|
|||
#undef BOOL
|
||||
#endif
|
||||
|
||||
#ifndef NSINTEGER_DEFINED
|
||||
#if __LP64__ || NS_BUILD_32_LIKE_64
|
||||
typedef long NSInteger;
|
||||
typedef unsigned long NSUInteger;
|
||||
#else
|
||||
typedef int NSInteger;
|
||||
typedef unsigned int NSUInteger;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@interface X11Controller : NSObject
|
||||
{
|
||||
IBOutlet NSPanel *prefs_panel;
|
||||
|
|
|
@ -164,11 +164,7 @@ BOOL xquartz_resetenv_display = NO;
|
|||
|
||||
item = (NSMenuItem *) [menu addItemWithTitle:name action:@selector
|
||||
(item_selected:) keyEquivalent:shortcut];
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
|
||||
[item setKeyEquivalentModifierMask:(NSUInteger) windowItemModMask];
|
||||
#else
|
||||
[item setKeyEquivalentModifierMask:windowItemModMask];
|
||||
#endif
|
||||
[item setTarget:self];
|
||||
[item setTag:i];
|
||||
[item setEnabled:YES];
|
||||
|
@ -177,11 +173,7 @@ BOOL xquartz_resetenv_display = NO;
|
|||
action:@selector
|
||||
(item_selected:) keyEquivalent:shortcut
|
||||
atIndex:i];
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
|
||||
[item setKeyEquivalentModifierMask:(NSUInteger) windowItemModMask];
|
||||
#else
|
||||
[item setKeyEquivalentModifierMask:windowItemModMask];
|
||||
#endif
|
||||
[item setTarget:self];
|
||||
[item setTag:i];
|
||||
[item setEnabled:YES];
|
||||
|
|
Loading…
Reference in New Issue
Block a user