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/llmessage/llhost.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/llmessage/llhost.cpp')
| -rw-r--r-- | indra/llmessage/llhost.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/indra/llmessage/llhost.cpp b/indra/llmessage/llhost.cpp index f4a1740663..501d9465c2 100644 --- a/indra/llmessage/llhost.cpp +++ b/indra/llmessage/llhost.cpp @@ -8,19 +8,21 @@ #include "linden_common.h" - -#if !LL_WINDOWS -#include <netdb.h> -#include <netinet/in.h> // ntonl() -#include <sys/types.h> -#include <sys/socket.h> -#include <arpa/inet.h> -#endif - #include "llhost.h" #include "llerror.h" +#if LL_WINDOWS + #define WIN32_LEAN_AND_MEAN + #include <winsock2.h> +#else + #include <netdb.h> + #include <netinet/in.h> // ntonl() + #include <sys/types.h> + #include <sys/socket.h> + #include <arpa/inet.h> +#endif + LLHost LLHost::invalid(INVALID_PORT,INVALID_HOST_IP_ADDRESS); LLHost::LLHost(const std::string& ip_and_port) |