From: Mikko Rasa <tdb@tdb.fi>
Date: Tue, 7 Apr 2015 10:58:25 +0000 (+0300)
Subject: Include winsock2.h first
X-Git-Url: http://git.tdb.fi/?p=libs%2Fnet.git;a=commitdiff_plain;h=dd8b0e7471bb85d26cc63da2f0819ceeff30550f

Include winsock2.h first

It wants to get included before windows.h
---

diff --git a/source/net/datagramsocket.cpp b/source/net/datagramsocket.cpp
index d24ca4e..664c265 100644
--- a/source/net/datagramsocket.cpp
+++ b/source/net/datagramsocket.cpp
@@ -1,3 +1,6 @@
+#ifdef WIN32
+#include <winsock2.h>
+#endif
 #include <cerrno>
 #include <msp/core/systemerror.h>
 #include <msp/io/handle_private.h>
diff --git a/source/net/socket.cpp b/source/net/socket.cpp
index 99a2bc4..7c16217 100644
--- a/source/net/socket.cpp
+++ b/source/net/socket.cpp
@@ -1,4 +1,6 @@
-#ifndef WIN32
+#ifdef WIN32
+#include <winsock2.h>
+#else
 #include <cerrno>
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/source/net/streamserversocket.cpp b/source/net/streamserversocket.cpp
index bbf91bc..8039ec9 100644
--- a/source/net/streamserversocket.cpp
+++ b/source/net/streamserversocket.cpp
@@ -1,3 +1,6 @@
+#ifdef WIN32
+#include <winsock2.h>
+#endif
 #include <cerrno>
 #include <msp/core/refptr.h>
 #include <msp/core/systemerror.h>
diff --git a/source/net/streamsocket.cpp b/source/net/streamsocket.cpp
index 3da0cc3..1dab2e3 100644
--- a/source/net/streamsocket.cpp
+++ b/source/net/streamsocket.cpp
@@ -1,4 +1,6 @@
-#ifndef WIN32
+#ifdef WIN32
+#include <winsock2.h>
+#else
 #include <sys/socket.h>
 #endif
 #include <cerrno>