diff options
author | Dave Parks <davep@lindenlab.com> | 2022-03-09 12:48:52 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2022-03-09 12:48:52 -0600 |
commit | 0e954a9afd7cc300bdd4cadfc25baa7f2607e5a4 (patch) | |
tree | 79c976e2bacf64f061f6cce20d248af89eb92103 /indra/llcommon | |
parent | 2b2a5da0990def249dc028e0bb842843e51feed1 (diff) |
SL-16972 Per feedback from Ansariel, only bump up max heap size on 64-bit builds.
Diffstat (limited to 'indra/llcommon')
-rw-r--r-- | indra/llcommon/llprocessor.cpp | 14 | ||||
-rw-r--r-- | indra/llcommon/llprocessor.h | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp index 5d16a4b74d..818df07bb2 100644 --- a/indra/llcommon/llprocessor.cpp +++ b/indra/llcommon/llprocessor.cpp @@ -44,20 +44,6 @@ #include "llsd.h" -#if LL_MSVC && _M_X64 -# define LL_X86_64 1 -# define LL_X86 1 -#elif LL_MSVC && _M_IX86 -# define LL_X86 1 -#elif LL_GNUC && ( defined(__amd64__) || defined(__x86_64__) ) -# define LL_X86_64 1 -# define LL_X86 1 -#elif LL_GNUC && ( defined(__i386__) ) -# define LL_X86 1 -#elif LL_GNUC && ( defined(__powerpc__) || defined(__ppc__) ) -# define LL_PPC 1 -#endif - class LLProcessorInfoImpl; // foward declaration for the mImpl; namespace diff --git a/indra/llcommon/llprocessor.h b/indra/llcommon/llprocessor.h index 90e5bc59ee..b77eb22c3a 100644 --- a/indra/llcommon/llprocessor.h +++ b/indra/llcommon/llprocessor.h @@ -29,6 +29,20 @@ #define LLPROCESSOR_H #include "llunits.h" +#if LL_MSVC && _M_X64 +# define LL_X86_64 1 +# define LL_X86 1 +#elif LL_MSVC && _M_IX86 +# define LL_X86 1 +#elif LL_GNUC && ( defined(__amd64__) || defined(__x86_64__) ) +# define LL_X86_64 1 +# define LL_X86 1 +#elif LL_GNUC && ( defined(__i386__) ) +# define LL_X86 1 +#elif LL_GNUC && ( defined(__powerpc__) || defined(__ppc__) ) +# define LL_PPC 1 +#endif + class LLProcessorInfoImpl; class LL_COMMON_API LLProcessorInfo |