From 58adf0a6f9344857c2109dc70480177b7fd5d4a0 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Mon, 21 May 2012 10:03:08 +0200
Subject: [PATCH] Fixed: Some Windows.h inclusions

---
 code/nel/include/nel/misc/dynloadlib.h             |  5 +++--
 code/nel/include/nel/net/service.h                 | 14 ++++++++++++++
 code/nel/src/misc/stdmisc.h                        |  1 +
 .../src/sound/driver/fmod/sound_driver_fmod.cpp    |  4 ++++
 code/nel/tools/nel_unit_test/nel_unit_test.cpp     |  2 ++
 5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/code/nel/include/nel/misc/dynloadlib.h b/code/nel/include/nel/misc/dynloadlib.h
index 6f74702b8..1cec2573a 100644
--- a/code/nel/include/nel/misc/dynloadlib.h
+++ b/code/nel/include/nel/misc/dynloadlib.h
@@ -22,8 +22,9 @@
 #include <vector>
 
 #ifdef NL_OS_WINDOWS
-#	define NOMINMAX
-#	include <windows.h>
+struct HINSTANCE__;
+typedef struct HINSTANCE__ *HINSTANCE;
+typedef HINSTANCE HMODULE;      /* HMODULEs can be used in place of HINSTANCEs */
 #else
 #	include <dlfcn.h>
 #endif
diff --git a/code/nel/include/nel/net/service.h b/code/nel/include/nel/net/service.h
index 316a9ce0f..6097a535f 100644
--- a/code/nel/include/nel/net/service.h
+++ b/code/nel/include/nel/net/service.h
@@ -42,6 +42,20 @@ namespace NLMISC
 	class CWindowDisplayer;
 }
 
+#if defined(NL_OS_WINDOWS) && defined(_WINDOWS)
+#ifndef WINAPI
+#define WINAPI      __stdcall
+#endif
+#ifndef APIENTRY
+#define APIENTRY    WINAPI
+#endif
+
+struct HINSTANCE__;
+typedef struct HINSTANCE__ *HINSTANCE;
+
+typedef char CHAR;
+typedef CHAR *LPSTR;
+#endif
 
 namespace NLNET
 {
diff --git a/code/nel/src/misc/stdmisc.h b/code/nel/src/misc/stdmisc.h
index 572a90f1a..b12aeb26a 100644
--- a/code/nel/src/misc/stdmisc.h
+++ b/code/nel/src/misc/stdmisc.h
@@ -55,6 +55,7 @@
 
 #ifdef NL_OS_WINDOWS
 	#define NOMINMAX
+	#include <WinSock2.h>
 	#include <windows.h>
 #endif
 
diff --git a/code/nel/src/sound/driver/fmod/sound_driver_fmod.cpp b/code/nel/src/sound/driver/fmod/sound_driver_fmod.cpp
index caad324be..617ed3473 100644
--- a/code/nel/src/sound/driver/fmod/sound_driver_fmod.cpp
+++ b/code/nel/src/sound/driver/fmod/sound_driver_fmod.cpp
@@ -22,6 +22,10 @@
 #include "source_fmod.h"
 #include "buffer_fmod.h"
 
+#ifdef NL_OS_WINDOWS
+#include <Windows.h>
+#endif
+
 using namespace std;
 using namespace NLMISC;
 
diff --git a/code/nel/tools/nel_unit_test/nel_unit_test.cpp b/code/nel/tools/nel_unit_test/nel_unit_test.cpp
index ba9b8851c..45e579b13 100644
--- a/code/nel/tools/nel_unit_test/nel_unit_test.cpp
+++ b/code/nel/tools/nel_unit_test/nel_unit_test.cpp
@@ -34,6 +34,8 @@ using namespace std;
 
 #ifdef _MSC_VER
 
+#include <Windows.h>
+
 /** A special stream buffer that output in the 'output debug string' feature of windows.
  */
 class CDebugOutput : public streambuf