Fixed Windows compile error introduced in fe9a3d2b. Also made sure winsock2.h is always included before windows.h throughout the source to prevent collisions

15 files changed, 31 insertions, 1 deletions

diff --git a/linden/indra/llcommon/aiaprpool.h b/linden/indra/llcommon/aiaprpool.h
index 72e9ddb..ac523a9 100644
--- a/linden/indra/llcommon/aiaprpool.h
+++ b/linden/indra/llcommon/aiaprpool.h
@@ -38,7 +38,9 @@
 #define AIAPRPOOL_H
 
 #ifdef LL_WINDOWS
-#include <ws2tcpip.h>           // Needed before including apr_portable.h
+//#include <ws2tcpip.h>         
+# define WIN32_LEAN_AND_MEAN
+# include <winsock2.h> // Needed before including apr_portable.h
 #endif
 
 #include "apr_portable.h"
diff --git a/linden/indra/llcommon/llerror.cpp b/linden/indra/llcommon/llerror.cpp
index b9be370..a9587c6 100644
--- a/linden/indra/llcommon/llerror.cpp
+++ b/linden/indra/llcommon/llerror.cpp
@@ -46,6 +46,8 @@
 # include <unistd.h>
 #endif // !LL_WINDOWS
 #if LL_WINDOWS
+#       define WIN32_LEAN_AND_MEAN
+#       include <winsock2.h>
 # include <windows.h>
 #endif // LL_WINDOWS
 #include <vector>
diff --git a/linden/indra/llcommon/llfile.cpp b/linden/indra/llcommon/llfile.cpp
index 2a76f7f..6b68630 100644
--- a/linden/indra/llcommon/llfile.cpp
+++ b/linden/indra/llcommon/llfile.cpp
@@ -34,6 +34,8 @@
  */
 
 #if LL_WINDOWS
+#       define WIN32_LEAN_AND_MEAN
+#       include <winsock2.h>
 #include <windows.h>
 #endif
 
diff --git a/linden/indra/llcommon/llfindlocale.cpp b/linden/indra/llcommon/llfindlocale.cpp
index 505f5c5..71675af 100644
--- a/linden/indra/llcommon/llfindlocale.cpp
+++ b/linden/indra/llcommon/llfindlocale.cpp
@@ -39,6 +39,8 @@
 #include <ctype.h>
 
 #ifdef WIN32
+#       define WIN32_LEAN_AND_MEAN
+#       include <winsock2.h>
 #include <windows.h>
 #include <winnt.h>
 #endif
diff --git a/linden/indra/llcommon/llmemory.cpp b/linden/indra/llcommon/llmemory.cpp
index 74004b0..2b01442 100644
--- a/linden/indra/llcommon/llmemory.cpp
+++ b/linden/indra/llcommon/llmemory.cpp
@@ -33,6 +33,8 @@
 #include "linden_common.h"
 
 #if defined(LL_WINDOWS)
+#       define WIN32_LEAN_AND_MEAN
+#       include <winsock2.h>
 # include <windows.h>
 # include <psapi.h>
 #elif defined(LL_DARWIN)
diff --git a/linden/indra/llcommon/llprocesslauncher.h b/linden/indra/llcommon/llprocesslauncher.h
index b72be27..9833a13 100644
--- a/linden/indra/llcommon/llprocesslauncher.h
+++ b/linden/indra/llcommon/llprocesslauncher.h
@@ -34,6 +34,8 @@
 #define LL_LLPROCESSLAUNCHER_H
 
 #if LL_WINDOWS
+#       define WIN32_LEAN_AND_MEAN
+#       include <winsock2.h>
 #include <windows.h>
 #endif
 
diff --git a/linden/indra/llplugin/llpluginsharedmemory.cpp b/linden/indra/llplugin/llpluginsharedmemory.cpp
index 883d7b6..6becb8d 100755
--- a/linden/indra/llplugin/llpluginsharedmemory.cpp
+++ b/linden/indra/llplugin/llpluginsharedmemory.cpp
@@ -84,6 +84,8 @@
         #include <sys/mman.h>
         #include <errno.h>
 #elif USE_WIN32_SHARED_MEMORY
+#       define WIN32_LEAN_AND_MEAN
+#       include <winsock2.h>
 #include <windows.h>
 #endif // USE_APR_SHARED_MEMORY
 
diff --git a/linden/indra/llplugin/slplugin/slplugin.cpp b/linden/indra/llplugin/slplugin/slplugin.cpp
index cca8ead..878577b 100755
--- a/linden/indra/llplugin/slplugin/slplugin.cpp
+++ b/linden/indra/llplugin/slplugin/slplugin.cpp
@@ -78,6 +78,8 @@ static void crash_handler(int sig)
 #endif
 
 #if LL_WINDOWS
+#       define WIN32_LEAN_AND_MEAN
+#       include <winsock2.h>
 #include <windows.h>
 ////////////////////////////////////////////////////////////////////////////////
 //      Our exception handler - will probably just exit and the host application
diff --git a/linden/indra/llvfs/llpidlock.h b/linden/indra/llvfs/llpidlock.h
index efcfd91..6103599 100755
--- a/linden/indra/llvfs/llpidlock.h
+++ b/linden/indra/llvfs/llpidlock.h
@@ -39,6 +39,8 @@ class LLFrameTimer;
 
 #if LL_WINDOWS  //For windows platform.
 
+#       define WIN32_LEAN_AND_MEAN
+#       include <winsock2.h>
 #include <windows.h>
 
 #else   //Everyone Else
diff --git a/linden/indra/llwindow/GL/glh_extensions.h b/linden/indra/llwindow/GL/glh_extensions.h
index b936b5d..5b149c9 100644
--- a/linden/indra/llwindow/GL/glh_extensions.h
+++ b/linden/indra/llwindow/GL/glh_extensions.h
@@ -17,6 +17,8 @@
 #include <stdio.h>
 
 #ifdef _WIN32
+#       define WIN32_LEAN_AND_MEAN
+#       include <winsock2.h>
 # include <windows.h>
 #endif
 
diff --git a/linden/indra/media_plugins/webkit/windows_volume_catcher.cpp b/linden/indra/media_plugins/webkit/windows_volume_catcher.cpp
index f1afea7..64f70c4 100644
--- a/linden/indra/media_plugins/webkit/windows_volume_catcher.cpp
+++ b/linden/indra/media_plugins/webkit/windows_volume_catcher.cpp
@@ -34,6 +34,8 @@
  */
 
 #include "volume_catcher.h"
+#       define WIN32_LEAN_AND_MEAN
+#       include <winsock2.h>
 #include <windows.h>
 #include "llmemory.h"
 class VolumeCatcherImpl : public LLSingleton<VolumeCatcherImpl>
diff --git a/linden/indra/test_apps/llplugintest/demo_plugin.cpp b/linden/indra/test_apps/llplugintest/demo_plugin.cpp
index 772fa16..fd67a58 100644
--- a/linden/indra/test_apps/llplugintest/demo_plugin.cpp
+++ b/linden/indra/test_apps/llplugintest/demo_plugin.cpp
@@ -33,6 +33,8 @@
 #include "linden_common.h"
 
 #ifdef WIN32
+#       define WIN32_LEAN_AND_MEAN
+#       include <winsock2.h>
 #include <windows.h>
 #endif
 
diff --git a/linden/indra/win_crash_logger/StdAfx.h b/linden/indra/win_crash_logger/StdAfx.h
index 021a995..79198c2 100644
--- a/linden/indra/win_crash_logger/StdAfx.h
+++ b/linden/indra/win_crash_logger/StdAfx.h
@@ -46,6 +46,8 @@
 
 
 // Windows Header Files:
+#       define WIN32_LEAN_AND_MEAN
+#       include <winsock2.h>
 #include <windows.h>
 
 // C RunTime Header Files
diff --git a/linden/indra/win_crash_logger/llcrashloggerwindows.h b/linden/indra/win_crash_logger/llcrashloggerwindows.h
index e6a9c77..f2a877e 100644
--- a/linden/indra/win_crash_logger/llcrashloggerwindows.h
+++ b/linden/indra/win_crash_logger/llcrashloggerwindows.h
@@ -34,6 +34,8 @@
 #define LLCRASHLOGGERWINDOWS_H
 
 #include "llcrashlogger.h"
+#       define WIN32_LEAN_AND_MEAN
+#       include <winsock2.h>
 #include "windows.h"
 #include "llstring.h"
 
diff --git a/linden/indra/win_updater/updater.cpp b/linden/indra/win_updater/updater.cpp
index 5031270..c6fa3c8 100644
--- a/linden/indra/win_updater/updater.cpp
+++ b/linden/indra/win_updater/updater.cpp
@@ -39,6 +39,8 @@
 // *TODO: Switch to fopen_s, strtok_s, etc.
 #define _CRT_SECURE_NO_DEPRECATE
 
+#       define WIN32_LEAN_AND_MEAN
+#       include <winsock2.h>
 #include <windows.h>
 #include <wininet.h>
 #include <stdio.h>