Skip to content

Fix MSVC compilation warnings with mbedTLS #3617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
saghul wants to merge 2 commits into from
+9 −4
Closed

Fix MSVC compilation warnings with mbedTLS #3617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2be6023
mbedtls: cast sockfd to int when storing in net_context fd
saghul Jun 19, 2026
6855316
cmake: honor DISABLE_WERROR on MSVC
saghul Jun 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1176,8 +1176,13 @@ endif()
if (MSVC)
# Turn off pointless microsoft security warnings.
add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
# Fail the build if any warnings
add_compile_options(/W3 /WX)
# Fail the build if any warnings, unless DISABLE_WERROR is set (mirrors
# the GCC/Clang -Werror gating above).
if ("${DISABLE_WERROR}" STREQUAL "OFF")
add_compile_options(/W3 /WX)
else()
add_compile_options(/W3)
endif()
# Unbreak MSVC broken preprocessor __VA_ARGS__ behaviour
if (MSVC_VERSION GREATER 1925)
add_compile_options(/Zc:preprocessor /wd5105)
Expand Down
2 changes: 1 addition & 1 deletion lib/tls/mbedtls/mbedtls-client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ lws_ssl_client_bio_create(struct lws *wsi)
lws_mbedtls_set_alpn(conn->ctx, alpn_comma);
}

conn->net.MBEDTLS_PRIVATE_V30_ONLY(fd) = wsi->desc.sockfd;
conn->net.MBEDTLS_PRIVATE_V30_ONLY(fd) = (int)wsi->desc.sockfd;
mbedtls_ssl_set_bio(&conn->ssl, &conn->net, lws_plat_mbedtls_net_send, lws_plat_mbedtls_net_recv, NULL);

return 0;
Expand Down
2 changes: 1 addition & 1 deletion lib/tls/mbedtls/mbedtls-server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ lws_tls_server_new_nonblocking(struct lws *wsi, lws_sockfd_type accept_fd)
return 1;
}

conn->net.MBEDTLS_PRIVATE_V30_ONLY(fd) = accept_fd;
conn->net.MBEDTLS_PRIVATE_V30_ONLY(fd) = (int)accept_fd;
mbedtls_ssl_set_bio(&conn->ssl, &conn->net, lws_plat_mbedtls_net_send, lws_plat_mbedtls_net_recv, NULL);

return 0;
Expand Down
Loading