diff options
author | Callum Prentice <callum@lindenlab.com> | 2021-06-07 18:55:00 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2021-06-07 18:55:00 -0700 |
commit | ad9ed0a94dfd37878b35b70e0a365017a1e548bf (patch) | |
tree | a86bee1eba9cd8c40c1408abf067e3f8f673a33f /indra/llcommon/stdtypes.h | |
parent | ac8640d338997020ca0650001ff004e1103ac5cb (diff) | |
parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) |
Merge with tip of Master after Viewer release
Diffstat (limited to 'indra/llcommon/stdtypes.h')
-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 6c9871e76c..887f6ab733 100644 --- a/indra/llcommon/stdtypes.h +++ b/indra/llcommon/stdtypes.h @@ -57,7 +57,7 @@ typedef unsigned __int64 U64; #else typedef long long int S64; typedef long long unsigned int U64; -#if LL_DARWIN || LL_LINUX || LL_SOLARIS +#if LL_DARWIN || LL_LINUX #define S64L(a) (a##LL) #define U64L(a) (a##ULL) #endif |