diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2021-06-29 10:48:02 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2021-06-29 10:48:02 -0400 |
| commit | 2e790e9b7250d5f79751fa5287c1993f3fa5c776 (patch) | |
| tree | 60dd4f9462ba11a4cb7503c64fa1dd2a23373a67 /indra/llmath/llsdutil_math.cpp | |
| parent | 1eeb4c85a120b23b853aabb8e6cf984b03dbc17f (diff) | |
| parent | 467d8339c970c253dada2cf0e1eed45be66593ac (diff) | |
DRTVWR-538: Merge branch 'master' into c++17
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> |