diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2022-11-13 05:59:40 -1000 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2022-11-13 05:59:40 -1000 |
| commit | 690a5027fb1760c31a72cc1c2fb44ae41ab340d2 (patch) | |
| tree | 881a4c5cb3a6508d437049ecffe66f78b73446a7 /indra/llcommon | |
| parent | 4349cb6165e983ff6bdd45ad1b82bb98bfc0436f (diff) | |
| parent | 076737cb6c28e9e5ea47cd4cb6ea9c5c514e578b (diff) | |
DRTVWR-575: Merge brad's xcode-14.1 fixes with nat's
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llsys.cpp | 2 | ||||
| -rw-r--r-- | indra/llcommon/llsys_objc.h | 4 | ||||
| -rw-r--r-- | indra/llcommon/llsys_objc.mm | 12 |
3 files changed, 10 insertions, 8 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 7a545843c0..91cb65b815 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -273,7 +273,7 @@ LLOSInfo::LLOSInfo() : { const char * DARWIN_PRODUCT_NAME = "Mac OS X"; - S32 major_version, minor_version, bugfix_version = 0; + int64_t major_version, minor_version, bugfix_version = 0; if (LLGetDarwinOSInfo(major_version, minor_version, bugfix_version)) { diff --git a/indra/llcommon/llsys_objc.h b/indra/llcommon/llsys_objc.h index 35599a574b..aebc600032 100644 --- a/indra/llcommon/llsys_objc.h +++ b/indra/llcommon/llsys_objc.h @@ -27,7 +27,9 @@ #ifndef LL_LLSYS_OBJC_H #define LL_LLSYS_OBJC_H -bool LLGetDarwinOSInfo(int &major, int &minor, int &patch); +#include <cstdint> + +bool LLGetDarwinOSInfo(int64_t &major, int64_t &minor, int64_t &patch); #endif // LL_LLSYS_OBJC_H diff --git a/indra/llcommon/llsys_objc.mm b/indra/llcommon/llsys_objc.mm index 81032658d7..3fd85fb1c9 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 int intAtStringIndex(NSArray *array, int index) +static auto intAtStringIndex(NSArray *array, int index) { - return int([(NSString *)[array objectAtIndex:index] integerValue]); + return [(NSString *)[array objectAtIndex:index] integerValue]; } -bool LLGetDarwinOSInfo(int &major, int &minor, int &patch) +bool LLGetDarwinOSInfo(int64_t &major, int64_t &minor, int64_t &patch) { if (NSAppKitVersionNumber > NSAppKitVersionNumber10_8) { NSOperatingSystemVersion osVersion = [[NSProcessInfo processInfo] operatingSystemVersion]; - major = int(osVersion.majorVersion); - minor = int(osVersion.minorVersion); - patch = int(osVersion.patchVersion); + major = osVersion.majorVersion; + minor = osVersion.minorVersion; + patch = osVersion.patchVersion; } else { |