diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-10-09 19:50:51 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-10-09 19:50:51 +0000 |
| commit | 846fc179b13ba06fe9a51be69d80e86d0f433a73 (patch) | |
| tree | 2061ad71bfdf04be832d8213b3fee643e6aec2ca /indra/llcommon/llsdutil.cpp | |
| parent | 18ddd70d96dc572ad94c81f9a1a3d08d7c7cdbc7 (diff) | |
| parent | 7cd076c796126692c308df5416b42b24a96609fb (diff) | |
Merged in euclid-desolarisify (pull request #335)
DRTVWR-510 remove all LL_SOLARIS conditional code
Approved-by: Andrey Kleshchev
Approved-by: Michael Pohoreski
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> |