andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

XQuartz: Check NSINTEGER_DEFINED to make sure the NSInteger and NSUInteger types are defined.

Browse Source 
(cherry picked from commit 36e02a8649)
This commit is contained in:
Jeremy Huddleston 2009-08-09 16:13:32 -07:00
parent 07c935b72f
commit af76bddd7a
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/xquartz/X11Controller.h
View File

@ -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;

8
hw/xquartz/X11Controller.m
View File

@ -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];