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/timing.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llcommon/timing.h')

diff --git a/indra/llcommon/timing.h b/indra/llcommon/timing.h
index f09fb0f92b..8952bc3b52 100644
--- a/indra/llcommon/timing.h
+++ b/indra/llcommon/timing.h
@@ -11,7 +11,7 @@
 
 #include <time.h>
 
-#if LL_LINUX || LL_DARWIN
+#if LL_LINUX || LL_DARWIN || LL_SOLARIS
 #		include <sys/time.h>
 #endif
 
-- 
cgit v1.2.3