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/llthread.cpp | |
| parent | 8f55c7ca759d0ed49d07c0e8c6578d7140e8f281 (diff) | |
| parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) | |
Merge branch 'master' into DRTVWR-520-apple-notarization
Diffstat (limited to 'indra/llcommon/llthread.cpp')
| -rw-r--r-- | indra/llcommon/llthread.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp index 0b9dec969c..98905f3b71 100644 --- a/indra/llcommon/llthread.cpp +++ b/indra/llcommon/llthread.cpp @@ -36,7 +36,7 @@ #include "lltracethreadrecorder.h" #include "llexception.h" -#if LL_LINUX || LL_SOLARIS +#if LL_LINUX #include <sched.h> #endif |