diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-08-09 16:13:32 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-09-04 00:43:48 -0700 |
| commit | 0ad3d2d70950281b38216089f63c5087ebefee91 (patch) | |
| tree | 5c3493cc9bba447786234421304b2bb6352d22ce | |
| parent | c06834cdff76f630e4c20d5e0b28e5c98e526a01 (diff) | |
XQuartz: Check NSINTEGER_DEFINED to make sure the NSInteger and NSUInteger types are defined.
(cherry picked from commit 36e02a8649c0a545084cce5fb2c5717277b9273c)
| -rw-r--r-- | hw/xquartz/X11Controller.h | 10 | ||||
| -rw-r--r-- | hw/xquartz/X11Controller.m | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/hw/xquartz/X11Controller.h b/hw/xquartz/X11Controller.h index 170bccc65..a86b20f17 100644 --- a/hw/xquartz/X11Controller.h +++ b/hw/xquartz/X11Controller.h @@ -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; diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m index 990053705..2a533de71 100644 --- a/hw/xquartz/X11Controller.m +++ b/hw/xquartz/X11Controller.m @@ -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]; |