XQuartz: Check NSINTEGER_DEFINED to make sure the NSInteger and NSUInteger types are defined.
(cherry picked from commit 36e02a8649
)
This commit is contained in:
parent
07c935b72f
commit
af76bddd7a
|
@ -45,6 +45,16 @@
|
||||||
#undef BOOL
|
#undef BOOL
|
||||||
#endif
|
#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
|
@interface X11Controller : NSObject
|
||||||
{
|
{
|
||||||
IBOutlet NSPanel *prefs_panel;
|
IBOutlet NSPanel *prefs_panel;
|
||||||
|
|
|
@ -163,11 +163,7 @@ BOOL xquartz_resetenv_display = NO;
|
||||||
|
|
||||||
item = (NSMenuItem *) [menu addItemWithTitle:name action:@selector
|
item = (NSMenuItem *) [menu addItemWithTitle:name action:@selector
|
||||||
(item_selected:) keyEquivalent:shortcut];
|
(item_selected:) keyEquivalent:shortcut];
|
||||||
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
|
|
||||||
[item setKeyEquivalentModifierMask:(NSUInteger) windowItemModMask];
|
[item setKeyEquivalentModifierMask:(NSUInteger) windowItemModMask];
|
||||||
#else
|
|
||||||
[item setKeyEquivalentModifierMask:windowItemModMask];
|
|
||||||
#endif
|
|
||||||
[item setTarget:self];
|
[item setTarget:self];
|
||||||
[item setTag:i];
|
[item setTag:i];
|
||||||
[item setEnabled:YES];
|
[item setEnabled:YES];
|
||||||
|
@ -176,11 +172,7 @@ BOOL xquartz_resetenv_display = NO;
|
||||||
action:@selector
|
action:@selector
|
||||||
(item_selected:) keyEquivalent:shortcut
|
(item_selected:) keyEquivalent:shortcut
|
||||||
atIndex:i];
|
atIndex:i];
|
||||||
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
|
|
||||||
[item setKeyEquivalentModifierMask:(NSUInteger) windowItemModMask];
|
[item setKeyEquivalentModifierMask:(NSUInteger) windowItemModMask];
|
||||||
#else
|
|
||||||
[item setKeyEquivalentModifierMask:windowItemModMask];
|
|
||||||
#endif
|
|
||||||
[item setTarget:self];
|
[item setTarget:self];
|
||||||
[item setTag:i];
|
[item setTag:i];
|
||||||
[item setEnabled:YES];
|
[item setEnabled:YES];
|
||||||
|
|
Loading…
Reference in New Issue
Block a user