Merge pull request #2934 from akikoskinen/mingw_build_fix

Fix build on mingw (master branch)

src/common.h

@@ -38,6 +38,7 @@
 # include <direct.h>
 # include <winsock2.h>
 # include <windows.h>
+# include <ws2tcpip.h>
 # include "win32/msvc-compat.h"
 # include "win32/mingw-compat.h"
 # include "win32/error.h"

src/openssl_stream.c

@@ -7,14 +7,7 @@
 
 #ifdef GIT_SSL
 
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#include <openssl/x509v3.h>
-
 #include <ctype.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 
 #include "global.h"
 #include "posix.h"
@@ -23,6 +16,16 @@
 #include "netops.h"
 #include "git2/transport.h"
 
+#ifndef GIT_WIN32
+# include <sys/types.h>
+# include <sys/socket.h>
+# include <netinet/in.h>
+#endif
+
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <openssl/x509v3.h>
+
 static int ssl_set_error(SSL *ssl, int error)
 {
 	int err;