diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-07 21:04:32 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-07 21:04:32 +0300 |
| commit | a4595bdaf2f24b8c08ae8c1e7a4b3dc9e9c2ef4b (patch) | |
| tree | 0679478dcf2d3a77c52ec436fe5e724bf7542c85 /indra/llmath/llsdutil_math.cpp | |
| parent | b6ac642db2213cf4207dddc47a1fe1490de0cc6e (diff) | |
| parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) | |
Merge branch 'master' into DRTVWR-521-maint
# Conflicts:
# doc/contributions.txt
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> |