Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git

indra/llcommon/llapp.cpp

@@ -53,7 +53,7 @@
 // Windows uses structured exceptions, so it's handled a bit differently.
 //
 #if LL_WINDOWS
-#include "windows.h"
+#include <windows.h>
 
 LONG WINAPI default_windows_exception_handler(struct _EXCEPTION_POINTERS *exception_infop);
 BOOL ConsoleCtrlHandler(DWORD fdwCtrlType);

indra/llcommon/llapr.h

@@ -33,6 +33,8 @@
 #include <sys/param.h>  // Need PATH_MAX in APR headers...
 #endif
 
+#include "llwin32headerslean.h"
+
 #include <boost/noncopyable.hpp>
 
 #include "apr_thread_proc.h"

indra/llcommon/llprocesslauncher.h

@@ -33,9 +33,7 @@
 #ifndef LL_LLPROCESSLAUNCHER_H
 #define LL_LLPROCESSLAUNCHER_H
 
-#if LL_WINDOWS
-#include <windows.h>
-#endif
+#include "llwin32headerslean.h"
 
 
 /*

indra/llcommon/llwin32headers.h

@@ -33,6 +33,7 @@
 #endif
 #undef WIN32_LEAN_AND_MEAN
 #include <winsock2.h>
+#include <Ws2ipdef.h>
 #include <windows.h>
 // reset to default, which is lean
 #define WIN32_LEAN_AND_MEAN

indra/llcommon/llwin32headerslean.h

@@ -33,6 +33,7 @@
 #endif
 #define WIN32_LEAN_AND_MEAN
 #include <winsock2.h>
+#include <Ws2ipdef.h>
 #include <windows.h>
 #undef NOMINMAX
 #endif