Merge pull request 'windows build has more issues' (#10) from claude/issue-9 into master
Some checks failed
CI / build-test-release (push) Failing after 16m20s
Some checks failed
CI / build-test-release (push) Failing after 16m20s
Reviewed-on: #10
This commit is contained in:
commit
f40d2912cd
1 changed files with 4 additions and 1 deletions
|
|
@ -21,6 +21,9 @@ module;
|
|||
#if defined(CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_pc_windows_msvc) || defined(CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_w64_mingw32)
|
||||
#include <winsock2.h>
|
||||
#include <ws2tcpip.h>
|
||||
// <rpc.h> (pulled in transitively) defines `interface` as a macro for `struct`,
|
||||
// which collides with local variables named `interface` in this TU.
|
||||
#undef interface
|
||||
#else
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
|
|
@ -1471,7 +1474,7 @@ int Crafter::Run(int argc, char** argv) {
|
|||
sockaddr_in addr{};
|
||||
addr.sin_family = AF_INET;
|
||||
addr.sin_addr.s_addr = htonl(INADDR_ANY);
|
||||
addr.sin_port = htons(static_cast<uint16_t>(p));
|
||||
addr.sin_port = htons(static_cast<std::uint16_t>(p));
|
||||
bool ok = ::bind(s, reinterpret_cast<sockaddr*>(&addr), sizeof(addr)) == 0;
|
||||
closesock(s);
|
||||
if (ok) return p;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue