summaryrefslogtreecommitdiff
path: root/indra/llcommon/lluuid.cpp
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2020-10-08 16:48:25 -0600
committerDave Houlton <euclid@lindenlab.com>2020-10-08 17:16:22 -0600
commit7cd076c796126692c308df5416b42b24a96609fb (patch)
tree2061ad71bfdf04be832d8213b3fee643e6aec2ca /indra/llcommon/lluuid.cpp
parent18ddd70d96dc572ad94c81f9a1a3d08d7c7cdbc7 (diff)
DRTVWR-510 remove all LL_SOLARIS conditionals
Diffstat (limited to 'indra/llcommon/lluuid.cpp')
-rw-r--r--indra/llcommon/lluuid.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llcommon/lluuid.cpp b/indra/llcommon/lluuid.cpp
index b05630c6b5..e3b293e465 100644
--- a/indra/llcommon/lluuid.cpp
+++ b/indra/llcommon/lluuid.cpp
@@ -601,9 +601,7 @@ S32 LLUUID::getNodeID(unsigned char *node_id)
#define HAVE_NETINET_IN_H
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
-#if LL_SOLARIS
-#include <sys/sockio.h>
-#elif !LL_DARWIN
+#if !LL_DARWIN
#include <linux/sockios.h>
#endif
#endif