windows: constify first arg of plat fops open
authordspname <dspname@user.github.invalid.com>
Wed, 19 Apr 2017 12:28:48 +0000 (20:28 +0800)
committerAndy Green <andy@warmcat.com>
Wed, 19 Apr 2017 12:28:48 +0000 (20:28 +0800)
https://github.com/warmcat/libwebsockets/issues/871

lib/libwebsockets.h
lib/lws-plat-win.c
lib/ssl.c

index a960113..a291946 100644 (file)
@@ -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;
index 67c98f4..b8dd4f0 100644 (file)
@@ -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;
index 11aa14f..0279367 100644 (file)
--- a/lib/ssl.c
+++ b/lib/ssl.c
 
 #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)
 {