diff options
author | Callum Prentice <callum@mbp.local> | 2021-06-07 16:27:27 -0700 |
---|---|---|
committer | Callum Prentice <callum@mbp.local> | 2021-06-07 16:27:27 -0700 |
commit | 1b0e3d68183fb63ac5c160bc9aa7956746f33faf (patch) | |
tree | 260f0972726dc9d8957486f2e03773dac4a10afc /indra/llcommon/llthread.cpp | |
parent | 7772ed0cb2ebf81d4e6b1a35dcffdfe88f6c1bcc (diff) | |
parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) |
Merge branch 'master' into DRTVWR-531
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 |