diff options
| author | Richard Linden <none@none> | 2013-06-20 16:46:23 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-20 16:46:23 -0700 |
| commit | a2a6bf20d71f923e9a5e43f71213fffbfea5a2a6 (patch) | |
| tree | 7e2711d256f98872db24e1f9de4449d47e75ed88 /indra/llmessage/net.cpp | |
| parent | 2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff) | |
| parent | e2e6963677657e4f5c417edc8d60e8b2a37ad204 (diff) | |
merge with release
Diffstat (limited to 'indra/llmessage/net.cpp')
| -rwxr-xr-x | indra/llmessage/net.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llmessage/net.cpp b/indra/llmessage/net.cpp index 85aef5da00..1c9508214c 100755 --- a/indra/llmessage/net.cpp +++ b/indra/llmessage/net.cpp @@ -26,15 +26,13 @@ #include "linden_common.h" -#include "net.h" +//#include "net.h" // system library includes #include <stdexcept> #if LL_WINDOWS - #define WIN32_LEAN_AND_MEAN - #include <winsock2.h> - #include <windows.h> +#include "llwin32headerslean.h" #else #include <sys/types.h> #include <sys/socket.h> |