diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-07 21:04:54 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-07 21:04:54 +0300 |
| commit | 1639e1ceb40fcbc9120857a75cb91fa509b13614 (patch) | |
| tree | 82ab1af330d0069e14e5be01adc49d30f853c915 /indra/llcommon/llsdutil.cpp | |
| parent | e611a30fe742dbae02d20062532ca92473da9bed (diff) | |
| parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) | |
Merge branch 'master' into DRTVWR-527-maint
Diffstat (limited to 'indra/llcommon/llsdutil.cpp')
| -rw-r--r-- | indra/llcommon/llsdutil.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llsdutil.cpp b/indra/llcommon/llsdutil.cpp index 3f3edb661f..eb3a96b133 100644 --- a/indra/llcommon/llsdutil.cpp +++ b/indra/llcommon/llsdutil.cpp @@ -33,7 +33,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> |