diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-07 21:03:36 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-07 21:03:36 +0300 |
| commit | fa8f1862130fdef81f83e977743299623a50b7c7 (patch) | |
| tree | b32adc25c670238bcafa5301fb94d0a135ba360c /indra/llmath/llsdutil_math.cpp | |
| parent | 8f55c7ca759d0ed49d07c0e8c6578d7140e8f281 (diff) | |
| parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) | |
Merge branch 'master' into DRTVWR-520-apple-notarization
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> |