diff --git a/src/network/Sockets.cpp b/src/network/Sockets.cpp index a0b575c44..35c80593f 100644 --- a/src/network/Sockets.cpp +++ b/src/network/Sockets.cpp @@ -1,15 +1,14 @@ #include "commons.hpp" -#pragma comment(lib, "Ws2_32.lib") - -#define NOMINMAX #include #include #include #include #ifdef _WIN32 +#define NOMINMAX #include +#pragma comment(lib, "Ws2_32.lib") #define SHUT_RDWR SD_BOTH #else #include diff --git a/src/util/ObjectsPool.hpp b/src/util/ObjectsPool.hpp index 45923a2c5..aebcb9496 100644 --- a/src/util/ObjectsPool.hpp +++ b/src/util/ObjectsPool.hpp @@ -7,6 +7,14 @@ #if defined(_WIN32) #include +#elif defined(__ANDROID__) +static inline void* aligned_alloc(size_t alignment, size_t size) { + void* ptr = nullptr; + if (posix_memalign(&ptr, alignment, size) != 0) { + return nullptr; + } + return ptr; +} #endif namespace util { @@ -63,6 +71,8 @@ namespace util { std::unique_ptr ptr( #if defined(_WIN32) _aligned_malloc(sizeof(T), alignof(T)) +#elif defined(__ANDROID__) + aligned_alloc(sizeof(T), alignof(T)) #else std::aligned_alloc(alignof(T), sizeof(T)) #endif