diff --git a/src/network/Network.cpp b/src/network/Network.cpp index 1deee553..5e4bbc04 100644 --- a/src/network/Network.cpp +++ b/src/network/Network.cpp @@ -8,6 +8,22 @@ #include #include +#ifdef _WIN32 +/// included in curl.h +#else +#include +#include +#include +#include +#include +#include +#include +#include + +using SOCKET = int; + +#endif + #include "debug/Logger.hpp" using namespace network; @@ -171,20 +187,6 @@ public: } }; - -#ifdef _WIN32 -/// ... -#else -#include -#include -#include -#include -#include -#include -#include -#include -#endif - #ifndef _WIN32 static inline int closesocket(int descriptor) noexcept { return close(descriptor); @@ -227,13 +229,13 @@ static std::string to_string(const addrinfo* addr) { } class SocketImpl : public Socket { - int descriptor; + SOCKET descriptor; bool open = true; addrinfo* addr; size_t totalUpload = 0; size_t totalDownload = 0; public: - SocketImpl(int descriptor, addrinfo* addr) + SocketImpl(SOCKET descriptor, addrinfo* addr) : descriptor(descriptor), addr(addr) { } @@ -303,7 +305,7 @@ public: )) { throw std::runtime_error(gai_strerror(res)); } - int descriptor = socket( + SOCKET descriptor = socket( addrinfo->ai_family, addrinfo->ai_socktype, addrinfo->ai_protocol ); if (descriptor == -1) {