diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-12-12 17:44:47 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-12-12 17:44:47 +0200 |
| commit | 2b7ba3f90455d675770e68f7e338d39053a343b9 (patch) | |
| tree | 652c664acf1d848e894637c47c93f9aa17289954 /indra/llcommon/llsys_objc.mm | |
| parent | 80e39507810ea0d5e9931bea79e0bfda3e77ab9e (diff) | |
| parent | 7d9249d180f7bc228cad3d6f5ed4d5fb13296451 (diff) | |
Merge branch 'xcode-14.1' into contribute
Diffstat (limited to 'indra/llcommon/llsys_objc.mm')
| -rw-r--r-- | indra/llcommon/llsys_objc.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llsys_objc.mm b/indra/llcommon/llsys_objc.mm index cdb1e320d5..3fd85fb1c9 100644 --- a/indra/llcommon/llsys_objc.mm +++ b/indra/llcommon/llsys_objc.mm @@ -27,12 +27,12 @@ #import "llsys_objc.h" #import <AppKit/AppKit.h> -static int intAtStringIndex(NSArray *array, int index) +static auto intAtStringIndex(NSArray *array, int index) { 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) { |