windows build fixes
This commit is contained in:
parent
3121af2ec4
commit
1d116f8fa8
15 changed files with 137 additions and 31 deletions
|
@ -7,10 +7,16 @@
|
|||
#include <thespian/tcp.hpp>
|
||||
#include <thespian/trace.hpp>
|
||||
|
||||
#include <array>
|
||||
#include <cstring>
|
||||
#include <memory>
|
||||
|
||||
#if defined(_WIN32)
|
||||
#include <winsock2.h>
|
||||
#include <in6addr.h>
|
||||
#include <ws2ipdef.h>
|
||||
#include <ws2tcpip.h>
|
||||
#endif
|
||||
|
||||
using cbor::buffer;
|
||||
using cbor::extract;
|
||||
using std::make_shared;
|
||||
|
|
|
@ -9,9 +9,15 @@
|
|||
#include <thespian/tcp.hpp>
|
||||
|
||||
#include <cstring>
|
||||
#include <map>
|
||||
#include <utility>
|
||||
|
||||
#if defined(_WIN32)
|
||||
#include <winsock2.h>
|
||||
#include <in6addr.h>
|
||||
#include <ws2ipdef.h>
|
||||
#include <ws2tcpip.h>
|
||||
#endif
|
||||
|
||||
using cbor::any;
|
||||
using cbor::buffer;
|
||||
using cbor::extract;
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
#include <thespian/unx.hpp>
|
||||
|
||||
#include <cstring>
|
||||
#include <map>
|
||||
#include <sstream>
|
||||
#include <unistd.h>
|
||||
#include <utility>
|
||||
|
@ -38,6 +37,7 @@ using thespian::unx::mode;
|
|||
|
||||
using namespace std::chrono_literals;
|
||||
|
||||
#if !defined(_WIN32)
|
||||
namespace {
|
||||
|
||||
struct controller {
|
||||
|
@ -102,3 +102,12 @@ auto endpoint_unx(context &ctx, bool &result, env_t env_) -> ::result {
|
|||
},
|
||||
"endpoint_unx", move(env_)));
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
auto endpoint_unx(context &, bool &result, env_t) -> ::result {
|
||||
result = true;
|
||||
return ok();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
@ -7,7 +7,14 @@
|
|||
#include <thespian/socket.hpp>
|
||||
#include <thespian/tcp.hpp>
|
||||
|
||||
#if !defined(_WIN32)
|
||||
#include <netinet/in.h>
|
||||
#else
|
||||
#include <winsock2.h>
|
||||
#include <in6addr.h>
|
||||
#include <ws2ipdef.h>
|
||||
#include <ws2tcpip.h>
|
||||
#endif
|
||||
|
||||
using cbor::buffer;
|
||||
using cbor::extract;
|
||||
|
|
|
@ -6,7 +6,14 @@
|
|||
#include <thespian/timeout.hpp>
|
||||
#include <thespian/udp.hpp>
|
||||
|
||||
#if !defined(_WIN32)
|
||||
#include <netinet/in.h>
|
||||
#else
|
||||
#include <winsock2.h>
|
||||
#include <in6addr.h>
|
||||
#include <ws2ipdef.h>
|
||||
#include <ws2tcpip.h>
|
||||
#endif
|
||||
|
||||
using cbor::array;
|
||||
using cbor::buffer;
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
#include <mutex>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
using cbor::buffer;
|
||||
using std::cerr;
|
||||
|
@ -81,8 +80,10 @@ struct logger {
|
|||
extern "C" auto runtestcase(const char *name) -> int {
|
||||
mutex trace_m;
|
||||
|
||||
#if !defined(_WIN32)
|
||||
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) // NOLINT
|
||||
abort();
|
||||
#endif
|
||||
|
||||
auto gdb = getenv("JITDEBUG"); // NOLINT
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue