Merge pull request #1473 from esdrubal/sq

[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 2c62d71..6b21f05
--- a/mono/io-layer/io-layer.h
+++ b/mono/io-layer/io-layer.h
@@ -21,10 +21,16 @@
  * 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."
+ */
+#ifdef _MSC_VER
 #include <ws2tcpip.h>
+#endif
 #include <psapi.h>
 #include <shlobj.h>
 #include <mswsock.h>
@@ -36,4 +42,8 @@
 #include "mono/io-layer/uglify.h"
 #endif /* HOST_WIN32 */
 
+#ifdef __native_client__
+#include "mono/metadata/nacl-stub.h"
+#endif
+
 #endif /* _MONO_IOLAYER_IOLAYER_H_ */