From bd9e777b99c510491bb1d4f6fa9e8268953e957a Mon Sep 17 00:00:00 2001 From: JCash Date: Thu, 3 Sep 2020 17:28:10 +0200 Subject: [PATCH] Windows compile fixes --- websocket/include/wslay/config.h | 8 ++++++-- websocket/include/wslay/wslay.h | 8 ++++++++ websocket/src/websocket.h | 4 ++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/websocket/include/wslay/config.h b/websocket/include/wslay/config.h index 242cefa..9062c13 100644 --- a/websocket/include/wslay/config.h +++ b/websocket/include/wslay/config.h @@ -2,8 +2,12 @@ #ifndef CONFIG_H #define CONFIG_H -#define HAVE_ARPA_INET_H -#define HAVE_NETINET_IN_H +#if defined(_WIN32) + #define HAVE_WINSOCK2_H +#else + #define HAVE_ARPA_INET_H + #define HAVE_NETINET_IN_H +#endif /* #undef HAVE_WINSOCK2_H */ /* #undef WORDS_BIGENDIAN */ diff --git a/websocket/include/wslay/wslay.h b/websocket/include/wslay/wslay.h index 2fde81a..3306f2f 100644 --- a/websocket/include/wslay/wslay.h +++ b/websocket/include/wslay/wslay.h @@ -33,6 +33,14 @@ extern "C" { #include #include +// Defold addition +#if defined(_WIN32) + #if defined(_WIN64) + typedef int64_t ssize_t; + #else + typedef int32_t ssize_t; + #endif +#endif /* * wslay/wslayver.h is generated from wslay/wslayver.h.in by diff --git a/websocket/src/websocket.h b/websocket/src/websocket.h index 81f8673..b14a43b 100644 --- a/websocket/src/websocket.h +++ b/websocket/src/websocket.h @@ -1,5 +1,9 @@ #pragma once +#if defined(_WIN32) +#include +#endif + // include the Defold SDK #include