Merge pull request #3268 from esdrubal/mono-sym-enable

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

diff --git a/mono/io-layer/io-layer.h b/mono/io-layer/io-layer.h
old mode 100644 (file)
new mode 100755 (executable)
index 014c9a9..a3cbe2a
--- a/mono/io-layer/io-layer.h
+++ b/mono/io-layer/io-layer.h
@@ -14,23 +14,30 @@
 #if defined(__WIN32__) || defined(_WIN32)
 /* Native win32 */
 #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>
+/*
+ * The mingw version says:
+ * /usr/i686-pc-mingw32/sys-root/mingw/include/ws2tcpip.h:38:2: error: #error "ws2tcpip.h is not compatible with winsock.h. Include winsock2.h instead."
+ */
+#ifdef _MSC_VER
 #include <ws2tcpip.h>
+#endif
 #include <psapi.h>
 #include <shlobj.h>
-#include <mswsock.h>
-#if (_WIN32_WINNT < 0x0502)
-#undef GetProcessId
+/*
+ * Workaround for missing WSAPOLLFD typedef in mingw's winsock2.h that is required for mswsock.h below.
+ * Remove once http://sourceforge.net/p/mingw/bugs/1980/ is fixed.
+ */
+#if defined(__MINGW_MAJOR_VERSION) && __MINGW_MAJOR_VERSION == 4 
+typedef struct pollfd {
+  SOCKET fd;
+  short  events;
+  short  revents;
+} WSAPOLLFD, *PWSAPOLLFD, *LPWSAPOLLFD;
 #endif
+#include <mswsock.h>
 #else  /* EVERYONE ELSE */
 #include "mono/io-layer/wapi.h"
 #include "mono/io-layer/uglify.h"