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/llpreprocessor.h | |
| parent | ac8640d338997020ca0650001ff004e1103ac5cb (diff) | |
| parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) | |
Merge with tip of Master after Viewer release
Diffstat (limited to 'indra/llcommon/llpreprocessor.h')
| -rw-r--r-- | indra/llcommon/llpreprocessor.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h index bae402110a..b17a8e761a 100644 --- a/indra/llcommon/llpreprocessor.h +++ b/indra/llcommon/llpreprocessor.h @@ -34,16 +34,7 @@ #include <endian.h> #endif // LL_LINUX -#if LL_SOLARIS -# ifdef __sparc // Since we're talking Solaris 10 and up, only 64 bit is supported. -# define LL_BIG_ENDIAN 1 -# define LL_SOLARIS_ALIGNED_CPU 1 // used to designate issues where SPARC alignment is addressed -# define LL_SOLARIS_NON_MESA_GL 1 // The SPARC GL does not provide a MESA-based GL API -# endif -# include <sys/isa_defs.h> // ensure we know which end is up -#endif // LL_SOLARIS - -#if (defined(LL_WINDOWS) || (defined(LL_LINUX) && (__BYTE_ORDER == __LITTLE_ENDIAN)) || (defined(LL_DARWIN) && defined(__LITTLE_ENDIAN__)) || (defined(LL_SOLARIS) && defined(__i386))) +#if (defined(LL_WINDOWS) || (defined(LL_LINUX) && (__BYTE_ORDER == __LITTLE_ENDIAN)) || (defined(LL_DARWIN) && defined(__LITTLE_ENDIAN__))) #define LL_LITTLE_ENDIAN 1 #else #define LL_BIG_ENDIAN 1 |