kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uwp fixes

Browse Source
This commit is contained in:
Benjamin Sergeant 2020-05-01 11:27:59 -07:00
parent b21e2506bf
commit b34d9f6a06
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ccpp.yml vendored
View File

@ -60,7 +60,7 @@ jobs:
- run: | - run: |
mkdir build mkdir build
cd 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 - run: cmake --build build
# #

3
ixwebsocket/IXDNSLookup.cpp
View File

@ -13,6 +13,9 @@
#ifdef _UNICODE #ifdef _UNICODE
#undef _UNICODE #undef _UNICODE
#endif #endif
#ifdef UNICODE
#undef UNICODE
#endif
#include "IXDNSLookup.h" #include "IXDNSLookup.h"

8
test/IXGetFreePort.cpp
View File

@ -4,6 +4,14 @@
* Copyright (c) 2019 Machine Zone. All rights reserved. * 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 "IXGetFreePort.h"
#include <ixwebsocket/IXNetSystem.h> #include <ixwebsocket/IXNetSystem.h>