diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-07 21:03:36 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-07 21:03:36 +0300 |
commit | fa8f1862130fdef81f83e977743299623a50b7c7 (patch) | |
tree | b32adc25c670238bcafa5301fb94d0a135ba360c /indra/llcommon/lltimer.h | |
parent | 8f55c7ca759d0ed49d07c0e8c6578d7140e8f281 (diff) | |
parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) |
Merge branch 'master' into DRTVWR-520-apple-notarization
Diffstat (limited to 'indra/llcommon/lltimer.h')
-rw-r--r-- | indra/llcommon/lltimer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/lltimer.h b/indra/llcommon/lltimer.h index ec70213447..010f290b24 100644 --- a/indra/llcommon/lltimer.h +++ b/indra/llcommon/lltimer.h @@ -27,7 +27,7 @@ #ifndef LL_TIMER_H #define LL_TIMER_H -#if LL_LINUX || LL_DARWIN || LL_SOLARIS +#if LL_LINUX || LL_DARWIN #include <sys/time.h> #endif #include <limits.h> |