diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-10-09 19:50:51 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-10-09 19:50:51 +0000 |
| commit | 846fc179b13ba06fe9a51be69d80e86d0f433a73 (patch) | |
| tree | 2061ad71bfdf04be832d8213b3fee643e6aec2ca /indra/llcommon/lltimer.cpp | |
| parent | 18ddd70d96dc572ad94c81f9a1a3d08d7c7cdbc7 (diff) | |
| parent | 7cd076c796126692c308df5416b42b24a96609fb (diff) | |
Merged in euclid-desolarisify (pull request #335)
DRTVWR-510 remove all LL_SOLARIS conditional code
Approved-by: Andrey Kleshchev
Approved-by: Michael Pohoreski
Diffstat (limited to 'indra/llcommon/lltimer.cpp')
| -rw-r--r-- | indra/llcommon/lltimer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/lltimer.cpp b/indra/llcommon/lltimer.cpp index 76e892212a..aaa6df325c 100644 --- a/indra/llcommon/lltimer.cpp +++ b/indra/llcommon/lltimer.cpp @@ -32,7 +32,7 @@ #if LL_WINDOWS # include "llwin32headerslean.h" -#elif LL_LINUX || LL_SOLARIS || LL_DARWIN +#elif LL_LINUX || LL_DARWIN # include <errno.h> # include <sys/time.h> #else @@ -74,7 +74,7 @@ U32 micro_sleep(U64 us, U32 max_yields) ms_sleep((U32)(us / 1000)); return 0; } -#elif LL_LINUX || LL_SOLARIS || LL_DARWIN +#elif LL_LINUX || LL_DARWIN static void _sleep_loop(struct timespec& thiswait) { struct timespec nextwait; @@ -187,7 +187,7 @@ F64 calc_clock_frequency() #endif // LL_WINDOWS -#if LL_LINUX || LL_DARWIN || LL_SOLARIS +#if LL_LINUX || LL_DARWIN // Both Linux and Mac use gettimeofday for accurate time F64 calc_clock_frequency() { |