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

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

diff --git a/indra/llcommon/llsdutil.cpp b/indra/llcommon/llsdutil.cpp
index e6d9396f7d..2b94e19fd4 100644
--- a/indra/llcommon/llsdutil.cpp
+++ b/indra/llcommon/llsdutil.cpp
@@ -15,7 +15,7 @@
 #if LL_WINDOWS
 #	define WIN32_LEAN_AND_MEAN
 #	include <winsock2.h>	// for htonl
-#elif LL_LINUX
+#elif LL_LINUX || LL_SOLARIS
 #	include <netinet/in.h>
 #elif LL_DARWIN
 #	include <arpa/inet.h>
-- 
cgit v1.2.3