summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2021-06-29 10:48:02 -0400
committerNat Goodspeed <nat@lindenlab.com>2021-06-29 10:48:02 -0400
commit2e790e9b7250d5f79751fa5287c1993f3fa5c776 (patch)
tree60dd4f9462ba11a4cb7503c64fa1dd2a23373a67 /indra/llmessage
parent1eeb4c85a120b23b853aabb8e6cf984b03dbc17f (diff)
parent467d8339c970c253dada2cf0e1eed45be66593ac (diff)
DRTVWR-538: Merge branch 'master' into c++17
Diffstat (limited to 'indra/llmessage')
-rw-r--r--indra/llmessage/message.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/llmessage/message.h b/indra/llmessage/message.h
index 52dbf871db..e25a9ea7ef 100644
--- a/indra/llmessage/message.h
+++ b/indra/llmessage/message.h
@@ -35,10 +35,6 @@
#include <netinet/in.h>
#endif
-#if LL_SOLARIS
-#include <netinet/in.h>
-#endif
-
#if LL_WINDOWS
#include "winsock2.h" // htons etc.
#endif