diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2022-11-11 18:09:23 -0800 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2022-11-11 18:09:23 -0800 |
| commit | 076737cb6c28e9e5ea47cd4cb6ea9c5c514e578b (patch) | |
| tree | 34222173af225c920436d05fab3aaa65d395d70f | |
| parent | 22f6adefb892ab83168e6236e2453b62314d0db6 (diff) | |
DRTVWR-575 fix LLGetDarwinOSInfo for xcode-14.1. NSInteger is now 64 bits
| -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 | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 1951ca6843..f52433af40 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 9359503a19..ccd39a2d46 100644 --- a/indra/llcommon/llsys_objc.mm +++ b/indra/llcommon/llsys_objc.mm @@ -32,7 +32,7 @@ static NSInteger intAtStringIndex(NSArray *array, int index) return [(NSString *)[array objectAtIndex:index] integerValue]; } -bool LLGetDarwinOSInfo(NSInteger &major, NSInteger &minor, NSInteger &patch) +bool LLGetDarwinOSInfo(int64_t &major, int64_t &minor, int64_t &patch) { if (NSAppKitVersionNumber > NSAppKitVersionNumber10_8) { |