@@ -125,7 +125,11 @@ typedef int suseconds_t;
125125#define LWS_EXTERN
126126#endif
127127
128+ #if defined(__MINGW32__ )
129+ #define LWS_INVALID_FILE -1
130+ #else
128131#define LWS_INVALID_FILE INVALID_HANDLE_VALUE
132+ #endif
129133#define LWS_SOCK_INVALID (INVALID_SOCKET)
130134#define LWS_O_RDONLY _O_RDONLY
131135#define LWS_O_WRONLY _O_WRONLY
@@ -287,6 +291,18 @@ typedef int suseconds_t;
287291#include <mbedtls/ssl.h>
288292#include <mbedtls/entropy.h>
289293#include <mbedtls/ctr_drbg.h>
294+ #include <mbedtls/version.h>
295+
296+ #if !defined(MBEDTLS_PRIVATE )
297+ #define MBEDTLS_PRIVATE (_q ) _q
298+ #endif
299+
300+ #if (MBEDTLS_VERSION_MAJOR == 3 ) && (MBEDTLS_VERSION_MINOR == 0 )
301+ #define MBEDTLS_PRIVATE_V30_ONLY (_q ) MBEDTLS_PRIVATE(_q)
302+ #else
303+ #define MBEDTLS_PRIVATE_V30_ONLY (_q ) _q
304+ #endif
305+
290306#endif
291307#else
292308#include <openssl/ssl.h>
@@ -378,8 +394,12 @@ struct lws;
378394#if defined(_WIN32 )
379395#if !defined(LWS_WIN32_HANDLE_TYPES )
380396typedef SOCKET lws_sockfd_type ;
397+ #if defined(__MINGW32__ )
398+ typedef int lws_filefd_type ;
399+ #else
381400typedef HANDLE lws_filefd_type ;
382401#endif
402+ #endif
383403
384404
385405#define lws_pollfd pollfd
@@ -566,8 +586,11 @@ struct lws_vhost;
566586struct lws ;
567587
568588#include <libwebsockets/lws-dll2.h>
589+ #include <libwebsockets/lws-map.h>
590+
569591#include <libwebsockets/lws-fault-injection.h>
570592#include <libwebsockets/lws-timeout-timer.h>
593+ #include <libwebsockets/lws-cache-ttl.h>
571594#if defined(LWS_WITH_SYS_SMD )
572595#include <libwebsockets/lws-smd.h>
573596#endif
@@ -585,6 +608,10 @@ struct lws;
585608
586609#include <libwebsockets/lws-context-vhost.h>
587610
611+ #if defined(LWS_WITH_CONMON )
612+ #include <libwebsockets/lws-conmon.h>
613+ #endif
614+
588615#if defined(LWS_ROLE_MQTT )
589616#include <libwebsockets/lws-mqtt.h>
590617#endif
@@ -604,7 +631,11 @@ struct lws;
604631#if defined(LWS_WITH_FILE_OPS )
605632#include <libwebsockets/lws-vfs.h>
606633#endif
634+ #include <libwebsockets/lws-gencrypto.h>
635+
607636#include <libwebsockets/lws-lejp.h>
637+ #include <libwebsockets/lws-lecp.h>
638+ #include <libwebsockets/lws-cose.h>
608639#include <libwebsockets/lws-struct.h>
609640#include <libwebsockets/lws-threadpool.h>
610641#include <libwebsockets/lws-tokenize.h>
@@ -625,14 +656,15 @@ struct lws;
625656
626657#if defined(LWS_WITH_TLS )
627658
659+ #include <libwebsockets/lws-tls-sessions.h>
660+
628661#if defined(LWS_WITH_MBEDTLS )
629662#include <mbedtls/md5.h>
630663#include <mbedtls/sha1.h>
631664#include <mbedtls/sha256.h>
632665#include <mbedtls/sha512.h>
633666#endif
634667
635- #include <libwebsockets/lws-gencrypto.h>
636668#include <libwebsockets/lws-genhash.h>
637669#include <libwebsockets/lws-genrsa.h>
638670#include <libwebsockets/lws-genaes.h>
0 commit comments