diff options
author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2021-06-10 09:25:50 +0000 |
---|---|---|
committer | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2021-06-10 09:25:50 +0000 |
commit | 0ea94d2948ba8237fd39fa0df219e07ee44c9ff1 (patch) | |
tree | 71b56d5d6937a66166ca17eb0413a4a88c363113 /indra/llmath/llsdutil_math.cpp | |
parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) |
Merged master into DRTVWR-539
Diffstat (limited to 'indra/llmath/llsdutil_math.cpp')
-rw-r--r-- | indra/llmath/llsdutil_math.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmath/llsdutil_math.cpp b/indra/llmath/llsdutil_math.cpp index 591f7fde36..51e5e3764f 100644 --- a/indra/llmath/llsdutil_math.cpp +++ b/indra/llmath/llsdutil_math.cpp @@ -40,7 +40,7 @@ #if LL_WINDOWS # define WIN32_LEAN_AND_MEAN # include <winsock2.h> // for htonl -#elif LL_LINUX || LL_SOLARIS +#elif LL_LINUX # include <netinet/in.h> #elif LL_DARWIN # include <arpa/inet.h> |