diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-09-10 18:42:56 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-09-10 18:42:56 +0800 |
| commit | a4543cf3cd41a466599de61f02e6d3b3d09700c4 (patch) | |
| tree | 6743beff840669800d4bdc445919bd8f09a06cd5 /indra/llcommon/lltimer.cpp | |
| parent | 52d973e95567efcb145ed0de1f4b6f0e19663776 (diff) | |
| parent | 0797257992ee7f88456d3083ebf214485b75c139 (diff) | |
Merge branch 'main' into DRTVWR-559
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 1a99ac2886..e96927e9c1 100644 --- a/indra/llcommon/lltimer.cpp +++ b/indra/llcommon/lltimer.cpp @@ -35,7 +35,7 @@ #if LL_WINDOWS # include "llwin32headerslean.h" -#elif LL_LINUX || LL_DARWIN +#elif LL_LINUX || LL_DARWIN || LL_FREEBSD # include <errno.h> # include <sys/time.h> #else @@ -115,7 +115,7 @@ void ms_sleep(U32 ms) #endif -#elif LL_LINUX || LL_DARWIN +#elif LL_LINUX || LL_DARWIN || LL_FREEBSD static void _sleep_loop(struct timespec& thiswait) { struct timespec nextwait; @@ -233,7 +233,7 @@ F64 calc_clock_frequency() #endif // LL_WINDOWS -#if LL_LINUX || LL_DARWIN +#if LL_LINUX || LL_DARWIN || LL_FREEBSD // Both Linux and Mac use gettimeofday for accurate time F64 calc_clock_frequency() { |