From f4b73e69f6a8213716d5aac202db7566111da157 Mon Sep 17 00:00:00 2001
From: Jack Lloyd <jack@randombit.net>
Date: Mon, 4 Sep 2017 07:35:20 -0400
Subject: MinGW fixes

---
 src/lib/utils/info.txt     | 1 +
 src/lib/utils/os_utils.cpp | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/lib/utils')

diff --git a/src/lib/utils/info.txt b/src/lib/utils/info.txt
index cd0b4bc45..da39201d9 100644
--- a/src/lib/utils/info.txt
+++ b/src/lib/utils/info.txt
@@ -42,4 +42,5 @@ stl_util.h
 
 <libs>
 linux -> rt
+mingw -> ws2_32
 </libs>
diff --git a/src/lib/utils/os_utils.cpp b/src/lib/utils/os_utils.cpp
index f6ac38c0a..bfb3fcfe3 100644
--- a/src/lib/utils/os_utils.cpp
+++ b/src/lib/utils/os_utils.cpp
@@ -21,9 +21,8 @@
   */
   #define BOOST_ASIO_DISABLE_SERIAL_PORT
   #include <boost/asio.hpp>
-#endif
 
-#if defined(BOTAN_TARGET_OS_TYPE_IS_UNIX)
+#elif defined(BOTAN_TARGET_OS_TYPE_IS_UNIX)
   #include <sys/types.h>
   #include <sys/mman.h>
   #include <sys/resource.h>
@@ -37,7 +36,7 @@
 #elif defined(BOTAN_TARGET_OS_TYPE_IS_WINDOWS)
   #define NOMINMAX 1
   #include <winsock2.h>
-  #include <WS2tcpip.h>
+  #include <ws2tcpip.h>
   #include <windows.h>
 #endif
 
@@ -86,7 +85,7 @@ OS::open_socket(const std::string& hostname,
 
    return std::unique_ptr<OS::Socket>(new Asio_Socket(hostname, service));
 
-#elif defined(BOTAN_TARGET_OS_IS_WINDOWS)
+#elif defined(BOTAN_TARGET_OS_TYPE_IS_WINDOWS)
 
    class Winsock_Socket : public OS::Socket
       {
-- 
cgit v1.2.3