summaryrefslogtreecommitdiff
path: root/indra/llcommon/llsdutil.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-09-23 11:36:50 -0400
committerNat Goodspeed <nat@lindenlab.com>2024-09-23 11:36:50 -0400
commit8bcff54654f9ec98d166dabd38180be63dc8837c (patch)
tree65d1744531195f7ec3bd8eee000928dcd8ca62a9 /indra/llcommon/llsdutil.cpp
parent4af7cd51e9cc22d9dc2fe42e378051c55515ac8e (diff)
parentdb013ab0cb7dafb964b149a36b6963770f7427e5 (diff)
Merge remote branch 'develop'into release/luau-scripting
Diffstat (limited to 'indra/llcommon/llsdutil.cpp')
-rw-r--r--indra/llcommon/llsdutil.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llcommon/llsdutil.cpp b/indra/llcommon/llsdutil.cpp
index 12f67208c1..dbd89118c9 100644
--- a/indra/llcommon/llsdutil.cpp
+++ b/indra/llcommon/llsdutil.cpp
@@ -32,8 +32,7 @@
#include <sstream>
#if LL_WINDOWS
-# define WIN32_LEAN_AND_MEAN
-# include <winsock2.h> // for htonl
+# include "llwin32headers.h" // for htonl
#elif LL_LINUX
# include <netinet/in.h>
#elif LL_DARWIN