From 076737cb6c28e9e5ea47cd4cb6ea9c5c514e578b Mon Sep 17 00:00:00 2001 From: Brad Kittenbrink Date: Fri, 11 Nov 2022 18:09:23 -0800 Subject: DRTVWR-575 fix LLGetDarwinOSInfo for xcode-14.1. NSInteger is now 64 bits --- indra/llcommon/llsys_objc.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/llcommon/llsys_objc.h') 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 + +bool LLGetDarwinOSInfo(int64_t &major, int64_t &minor, int64_t &patch); #endif // LL_LLSYS_OBJC_H -- cgit v1.2.3 From c3ddd7092085a204b6241dc027c70972b08ee202 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Sun, 13 Nov 2022 06:10:02 -1000 Subject: DRTVWR-575: Explain that NSInteger is really int64_t. --- indra/llcommon/llsys_objc.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/llcommon/llsys_objc.h') diff --git a/indra/llcommon/llsys_objc.h b/indra/llcommon/llsys_objc.h index aebc600032..b48ff97bdb 100644 --- a/indra/llcommon/llsys_objc.h +++ b/indra/llcommon/llsys_objc.h @@ -29,6 +29,8 @@ #include +// C++ land doesn't define NSInteger, and we don't want to introduce that for +// this one case, so use int64_t instead (which is equivalent). bool LLGetDarwinOSInfo(int64_t &major, int64_t &minor, int64_t &patch); -- cgit v1.2.3