diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index be58ab92..2e82d4a4 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -60,7 +60,7 @@ jobs: - run: | mkdir build cd build - cmake -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0" -DCMAKE_CXX_COMPILER=cl.exe -DUSE_WS=1 -DUSE_TEST=1 .. + cmake -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0" -DCMAKE_CXX_COMPILER=cl.exe -DUSE_TEST=1 .. - run: cmake --build build # diff --git a/ixwebsocket/IXDNSLookup.cpp b/ixwebsocket/IXDNSLookup.cpp index b67c4682..09618704 100644 --- a/ixwebsocket/IXDNSLookup.cpp +++ b/ixwebsocket/IXDNSLookup.cpp @@ -13,6 +13,9 @@ #ifdef _UNICODE #undef _UNICODE #endif +#ifdef UNICODE +#undef UNICODE +#endif #include "IXDNSLookup.h" diff --git a/test/IXGetFreePort.cpp b/test/IXGetFreePort.cpp index d14456d6..ae603493 100644 --- a/test/IXGetFreePort.cpp +++ b/test/IXGetFreePort.cpp @@ -4,6 +4,14 @@ * Copyright (c) 2019 Machine Zone. All rights reserved. */ +// Using inet_addr will trigger an error on uwp without this +// FIXME: use a different api +#ifdef _WIN32 +#ifndef _WINSOCK_DEPRECATED_NO_WARNINGS +#define _WINSOCK_DEPRECATED_NO_WARNINGS +#endif +#endif + #include "IXGetFreePort.h" #include