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/llfasttimer.h | |
| parent | ac8640d338997020ca0650001ff004e1103ac5cb (diff) | |
| parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) | |
Merge with tip of Master after Viewer release
Diffstat (limited to 'indra/llcommon/llfasttimer.h')
| -rw-r--r-- | indra/llcommon/llfasttimer.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h index 5628a05b00..dfc63d08a2 100644 --- a/indra/llcommon/llfasttimer.h +++ b/indra/llcommon/llfasttimer.h @@ -125,9 +125,9 @@ public: #endif -#if (LL_LINUX || LL_SOLARIS) && !(defined(__i386__) || defined(__amd64__)) +#if (LL_LINUX) && !(defined(__i386__) || defined(__amd64__)) // - // Linux and Solaris implementation of CPU clock - non-x86. + // Linux implementation of CPU clock - non-x86. // This is accurate but SLOW! Only use out of desperation. // // Try to use the MONOTONIC clock if available, this is a constant time counter @@ -153,12 +153,12 @@ public: return (U32)(getCPUClockCount64() >> 8); } -#endif // (LL_LINUX || LL_SOLARIS) && !(defined(__i386__) || defined(__amd64__)) +#endif // (LL_LINUX) && !(defined(__i386__) || defined(__amd64__)) -#if (LL_LINUX || LL_SOLARIS || LL_DARWIN) && (defined(__i386__) || defined(__amd64__)) +#if (LL_LINUX || LL_DARWIN) && (defined(__i386__) || defined(__amd64__)) // - // Mac+Linux+Solaris FAST x86 implementation of CPU clock + // Mac+Linux FAST x86 implementation of CPU clock static U32 getCPUClockCount32() { U32 low(0),high(0); |