X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fio-layer%2Fio-layer.h;h=2c62d7183d675f24483b8fde9260add76c37164d;hb=73277ab4afd9821e52f44a938de18184ba4bf467;hp=7153eb223366365359a64095f8c9bb3eafd4d2ed;hpb=aedc931dceca226e1e8e3865f385c4b315d305e0;p=mono.git

diff --git a/mono/io-layer/io-layer.h b/mono/io-layer/io-layer.h
index 7153eb22336..2c62d7183d6 100644
--- a/mono/io-layer/io-layer.h
+++ b/mono/io-layer/io-layer.h
@@ -11,19 +11,29 @@
 #ifndef _MONO_IOLAYER_IOLAYER_H_
 #define _MONO_IOLAYER_IOLAYER_H_
 
-#include <config.h>
-
-#if defined(PLATFORM_WIN32)
+#if defined(__WIN32__) || defined(_WIN32)
 /* Native win32 */
-#define UNICODE
-#define _UNICODE
 #define __USE_W32_SOCKETS
-#include <w32api.h>
+#if (_WIN32_WINNT < 0x0502)
+/* GetProcessId is available on Windows XP SP1 and later.
+ * Windows SDK declares it unconditionally.
+ * MinGW declares for Windows XP and later.
+ * Declare as __GetProcessId for unsupported targets. */
+#define GetProcessId __GetProcessId
+#endif
+#include <winsock2.h>
 #include <windows.h>
+#include <winbase.h>
 #include <ws2tcpip.h>
+#include <psapi.h>
+#include <shlobj.h>
+#include <mswsock.h>
+#if (_WIN32_WINNT < 0x0502)
+#undef GetProcessId
+#endif
 #else	/* EVERYONE ELSE */
 #include "mono/io-layer/wapi.h"
 #include "mono/io-layer/uglify.h"
-#endif /* PLATFORM_WIN32 */
+#endif /* HOST_WIN32 */
 
 #endif /* _MONO_IOLAYER_IOLAYER_H_ */