diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-07 21:05:04 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-07 21:05:04 +0300 |
| commit | 3c40a833ef20bde5ccea56ce5c9ada0b28aeb57c (patch) | |
| tree | cd10b9e5627946b54f5f3a3c2d2e1f4ab50e6f40 /indra/llcommon/lltimer.h | |
| parent | 416ad1831f40052fccc01f012c4452d61e57f0f8 (diff) | |
| parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) | |
Merge branch 'master' into DRTVWR-530-maint
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> |