From af76bddd7a47092e2f0f85b2547c1cc74eb5cebc Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Sun, 9 Aug 2009 16:13:32 -0700 Subject: [PATCH] XQuartz: Check NSINTEGER_DEFINED to make sure the NSInteger and NSUInteger types are defined. (cherry picked from commit 36e02a8649c0a545084cce5fb2c5717277b9273c) --- hw/xquartz/X11Controller.h | 10 ++++++++++ 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 46ed02241..f58747e15 100644 --- a/hw/xquartz/X11Controller.m +++ b/hw/xquartz/X11Controller.m @@ -163,11 +163,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]; @@ -176,11 +172,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];