From 2d6fd20c60e8f3b712f075ce88c599c1d3caa6ab Mon Sep 17 00:00:00 2001 From: dspname Date: Wed, 19 Apr 2017 20:41:57 +0800 Subject: [PATCH] windows: constify first arg of plat fops open https://github.com/warmcat/libwebsockets/issues/871 --- lib/libwebsockets.h | 2 +- lib/lws-plat-win.c | 2 +- lib/ssl.c | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/libwebsockets.h b/lib/libwebsockets.h index ee2002c7..2a9fc6c1 100644 --- a/lib/libwebsockets.h +++ b/lib/libwebsockets.h @@ -4341,7 +4341,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 3b6c4a03..84e79830 100644 --- a/lib/ssl.c +++ b/lib/ssl.c @@ -21,6 +21,10 @@ #include "private-libwebsockets.h" +/* workaround for mingw */ +#if !defined(ECONNABORTED) +#define ECONNABORTED 103 +#endif int openssl_websocket_private_data_index, openssl_SSL_CTX_private_data_index;