diff options
| author | Jack Lloyd <[email protected]> | 2017-09-04 07:35:20 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2017-09-04 07:35:20 -0400 |
| commit | f4b73e69f6a8213716d5aac202db7566111da157 (patch) | |
| tree | 45497f87d9e5ad6dda2a5cd705931af2eb12dbb8 | |
| parent | 6b7e1ba04d394aa7feaee22e859c29264280bf4e (diff) | |
MinGW fixes
| -rw-r--r-- | src/lib/utils/info.txt | 1 | ||||
| -rw-r--r-- | src/lib/utils/os_utils.cpp | 7 |
2 files changed, 4 insertions, 4 deletions
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 { |