summaryrefslogtreecommitdiff
path: root/indra/llcommon/llsys_objc.mm
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llcommon/llsys_objc.mm')
-rw-r--r--indra/llcommon/llsys_objc.mm12
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/llcommon/llsys_objc.mm b/indra/llcommon/llsys_objc.mm
index 9359503a19..81032658d7 100644
--- a/indra/llcommon/llsys_objc.mm
+++ b/indra/llcommon/llsys_objc.mm
@@ -27,19 +27,19 @@
#import "llsys_objc.h"
#import <AppKit/AppKit.h>
-static NSInteger intAtStringIndex(NSArray *array, int index)
+static int intAtStringIndex(NSArray *array, int index)
{
- return [(NSString *)[array objectAtIndex:index] integerValue];
+ return int([(NSString *)[array objectAtIndex:index] integerValue]);
}
-bool LLGetDarwinOSInfo(NSInteger &major, NSInteger &minor, NSInteger &patch)
+bool LLGetDarwinOSInfo(int &major, int &minor, int &patch)
{
if (NSAppKitVersionNumber > NSAppKitVersionNumber10_8)
{
NSOperatingSystemVersion osVersion = [[NSProcessInfo processInfo] operatingSystemVersion];
- major = osVersion.majorVersion;
- minor = osVersion.minorVersion;
- patch = osVersion.patchVersion;
+ major = int(osVersion.majorVersion);
+ minor = int(osVersion.minorVersion);
+ patch = int(osVersion.patchVersion);
}
else
{