[io-layer] Extract file (#4255)

[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 6b21f056ca26eef00e231f6fbbd461d8b5b4f36c..f1d2e05344eb2be4543ae5971b631ef84694a6d6 100755 (executable)
--- a/mono/io-layer/io-layer.h
+++ b/mono/io-layer/io-layer.h
@@ -11,19 +11,15 @@
 #ifndef _MONO_IOLAYER_IOLAYER_H_
 #define _MONO_IOLAYER_IOLAYER_H_
 
+#include <config.h>
+#include <glib.h>
+
 #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>
-#include <winsock2.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."
@@ -32,14 +28,25 @@
 #include <ws2tcpip.h>
 #endif
 #include <psapi.h>
-#include <shlobj.h>
+
+ /*
+ * 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
+
+#if G_HAVE_API_SUPPORT(HAVE_CLASSIC_WINAPI_SUPPORT)
 #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 /* HOST_WIN32 */
 
 #ifdef __native_client__