From d373dcc7cbed5fdea72c6b71a5594e4e85549b43 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Fri, 20 Jul 2007 20:38:05 +0000
Subject: svn merge -r 64548:64837
 svn+ssh://svn/svn/linden/branches/maintenance into release * WARNING *: 
 maintenance r64837 is not the last rev to use in the next merge. use r65269

---
 indra/llcommon/llthread.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/llcommon/llthread.cpp')

diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp
index a92d553148..b7be8d6a3b 100644
--- a/indra/llcommon/llthread.cpp
+++ b/indra/llcommon/llthread.cpp
@@ -12,7 +12,7 @@
 
 #include "lltimer.h"
 
-#if LL_LINUX
+#if LL_LINUX || LL_SOLARIS
 #include <sched.h>
 #endif
 
@@ -206,7 +206,7 @@ void LLThread::setQuitting()
 // static
 void LLThread::yield()
 {
-#if LL_LINUX
+#if LL_LINUX || LL_SOLARIS
 	sched_yield(); // annoyingly, apr_thread_yield  is a noop on linux...
 #else
 	apr_thread_yield();
-- 
cgit v1.2.3