diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2023-06-01 11:35:51 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2023-06-01 11:35:51 -0400 |
commit | 48aecb5c8d10926caa62feb94231c3019162836a (patch) | |
tree | cd6dfca8b46592e930d68c878cf77238122f1969 /indra | |
parent | d844da2a6c5fc1a75e606150bb070fdb787698d3 (diff) | |
parent | 364516e8bc19f6435fd42893809080d4f64a3232 (diff) |
DRTVWR-575: Merge branch 'xcode-14.3' into fix-monterey
for GCC-friendly tweak to llssize
Diffstat (limited to 'indra')
-rw-r--r-- | indra/llcommon/stdtypes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/stdtypes.h b/indra/llcommon/stdtypes.h index da8512169c..0b43d7ad4b 100644 --- a/indra/llcommon/stdtypes.h +++ b/indra/llcommon/stdtypes.h @@ -41,7 +41,7 @@ typedef unsigned int U32; // to express an index that might go negative // (ssize_t is provided by SOME compilers, don't collide) -typedef typename std::make_signed<size_t>::type llssize; +typedef typename std::make_signed<std::size_t>::type llssize; #if LL_WINDOWS // https://docs.microsoft.com/en-us/cpp/build/reference/zc-wchar-t-wchar-t-is-native-type |