diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-01-04 02:04:29 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-01-04 02:04:29 +0000 |
| commit | d60f16540dba5616cd8260046b44ebc2a1047065 (patch) | |
| tree | ab241efaf58ba4eeb1916763cef337a04bc15d64 /indra/llcommon/llsdutil.cpp | |
| parent | 0434d35c160bcd0d78b8f4e795a62155f50a6fb8 (diff) | |
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431
This turned up the following "lost" changes:
llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly
llfontgl.cpp (from maintenance r50207) - whitespace only
inventorybridge.cpp (property - non-executable)
skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL
Diffstat (limited to 'indra/llcommon/llsdutil.cpp')
| -rw-r--r-- | indra/llcommon/llsdutil.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/indra/llcommon/llsdutil.cpp b/indra/llcommon/llsdutil.cpp index 9305f82e05..8fe43736e4 100644 --- a/indra/llcommon/llsdutil.cpp +++ b/indra/llcommon/llsdutil.cpp @@ -8,16 +8,21 @@ * $License$ */ -#if LL_LINUX -#include <netinet/in.h> -#endif -#if LL_DARWIN -#include <arpa/inet.h> -#endif - #include "linden_common.h" + #include "llsdutil.h" +#if LL_WINDOWS +# define WIN32_LEAN_AND_MEAN +# include <winsock2.h> // for htonl +#elif LL_LINUX +# include <netinet/in.h> +#elif LL_DARWIN +# include <arpa/inet.h> +#endif + + + // vector3 LLSD ll_sd_from_vector3(const LLVector3& vec) { |