diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2016-11-16 15:39:00 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2016-11-16 15:39:00 -0500 |
commit | f5e983962703b5cb39278048b1c35e712b2b2263 (patch) | |
tree | 64751be6b6b57309020c8e060d89ebb821274828 /indra/llcommon | |
parent | d833e45c28a5d3e3605b161a1b6bcf7c06093d25 (diff) |
DRTVWR-418: Replace preprocessor tests for Windows-specific _M_AMD64
with tests on ADDRESS_SIZE, which is now set on the compiler command line.
Diffstat (limited to 'indra/llcommon')
-rw-r--r-- | indra/llcommon/llpreprocessor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h index 7c277c2bed..3698d9db44 100644 --- a/indra/llcommon/llpreprocessor.h +++ b/indra/llcommon/llpreprocessor.h @@ -139,7 +139,7 @@ #pragma warning (disable : 4180) // qualifier applied to function type has no meaning; ignored //#pragma warning( disable : 4284 ) // silly MS warning deep inside their <map> include file -#ifdef _M_AMD64 +#if ADDRESS_SIZE == 64 // That one is all over the place for x64 builds. #pragma warning( disable : 4267 ) // 'var' : conversion from 'size_t' to 'type', possible loss of data) #endif |