diff --git a/lib/libwebsockets.h b/lib/libwebsockets.h index a9601135..a2919464 100644 --- a/lib/libwebsockets.h +++ b/lib/libwebsockets.h @@ -4423,7 +4423,7 @@ lws_cgi_kill(struct lws *wsi); struct lws_plat_file_ops; -#if defined(WIN32) || defined(_WIN32) +#if (defined(WIN32) || defined(_WIN32)) && !defined(__MINGW32__) /* ... */ #if !defined(ssize_t) typedef SSIZE_T ssize_t; diff --git a/lib/lws-plat-win.c b/lib/lws-plat-win.c index 67c98f4b..b8dd4f02 100644 --- a/lib/lws-plat-win.c +++ b/lib/lws-plat-win.c @@ -526,7 +526,7 @@ lws_plat_inet_ntop(int af, const void *src, char *dst, int cnt) } LWS_VISIBLE lws_fop_fd_t -_lws_plat_file_open(struct lws_plat_file_ops *fops, const char *filename, +_lws_plat_file_open(const struct lws_plat_file_ops *fops, const char *filename, const char *vpath, lws_fop_flags_t *flags) { HANDLE ret; diff --git a/lib/ssl.c b/lib/ssl.c index 11aa14f4..0279367f 100644 --- a/lib/ssl.c +++ b/lib/ssl.c @@ -21,6 +21,11 @@ #include "private-libwebsockets.h" +/* workaround for mingw */ +#if !defined(ECONNABORTED) +#define ECONNABORTED 103 +#endif + int lws_alloc_vfs_file(struct lws_context *context, const char *filename, uint8_t **buf, lws_filepos_t *amount) {