2008-04-22 Dick Porter <dick@ximian.com>

[mono.git] / mono / io-layer / io-layer.h

diff --git a/mono/io-layer/io-layer.h b/mono/io-layer/io-layer.h
index 72d24f45c2bb33bf135479df44fab9e15bd22647..4776f8d4b1e875b84d8fddf264137641aa5689bd 100644 (file)
--- a/mono/io-layer/io-layer.h
+++ b/mono/io-layer/io-layer.h
@@ -13,15 +13,35 @@
 
 #if defined(__WIN32__)
 /* Native win32 */
-#define UNICODE
-#define _UNICODE
 #define __USE_W32_SOCKETS
+#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
+#ifndef HAVE_GETPROCESSID
+#ifdef _MSC_VER
+#include <winternl.h>
+#ifndef NT_SUCCESS
+#define NT_SUCCESS(status) ((NTSTATUS) (status) >= 0)
+#endif /* !NT_SUCCESS */
+#else /* !_MSC_VER */
+#include <ddk/ntddk.h>
+#include <ddk/ntapi.h>
+#endif /* _MSC_VER */
+#endif /* !HAVE_GETPROCESSID */
 #else  /* EVERYONE ELSE */
 #include "mono/io-layer/wapi.h"
 #include "mono/io-layer/uglify.h"