diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-07 21:03:27 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-07 21:03:27 +0300 |
commit | e7319fb6710f7121ead544493af6407482aea44c (patch) | |
tree | a2c8706ff26103026c4c8a1af8fc4fea8c9c3bbb /indra/llcommon/lltimer.h | |
parent | 34ef50f3b272cbf01e96a8356a1e67f2ec831452 (diff) | |
parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) |
Merge branch 'master' into DRTVWR-518-ui
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> |