diff --git a/thirdparty/README.md b/thirdparty/README.md index b315d89f4e7..2459ef807fb 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -774,7 +774,7 @@ Patches in the `patches` directory should be re-applied after updates. ## wslay - Upstream: https://github.com/tatsuhiro-t/wslay -- Version: 1.1.1+git (45d22583b488f79d5a4e598cc7675c191c5ab53f, 2021) +- Version: 1.1.1+git (0e7d106ff89ad6638090fd811a9b2e4c5dda8d40, 2022) - License: MIT File extracted from upstream release tarball: @@ -791,7 +791,7 @@ File extracted from upstream release tarball: ## xatlas - Upstream: https://github.com/jpcy/xatlas -- Version: git (16ace528acd2cf1f16a7c0dde99c42c486488dbe, 2022) +- Version: git (f700c7790aaa030e794b52ba7791a05c085faf0c, 2022) - License: MIT Files extracted from upstream source: diff --git a/thirdparty/wslay/config.h b/thirdparty/wslay/config.h index f291801ba14..d05cb302c94 100644 --- a/thirdparty/wslay/config.h +++ b/thirdparty/wslay/config.h @@ -1,10 +1,18 @@ #ifndef CONFIG_H #define CONFIG_H -// -- GODOT start -- +/* This configuration file is custom written for Godot. + * When updating the library, generate it with CMake upstream and compare + * the contents to see if new options should be backported here. + */ + +// Those are handled in our SCsub. +/* #undef HAVE_ARPA_INET_H */ +/* #undef HAVE_NETINET_IN_H */ +/* #undef HAVE_WINSOCK2_H */ + #ifdef BIG_ENDIAN_ENABLED #define WORDS_BIGENDIAN #endif -// -- GODOT end -- #endif /* CONFIG_H */ diff --git a/thirdparty/wslay/wslay/wslay.h b/thirdparty/wslay/wslay/wslay.h index ac6873613f0..b7fe516ba3b 100644 --- a/thirdparty/wslay/wslay/wslay.h +++ b/thirdparty/wslay/wslay/wslay.h @@ -485,7 +485,7 @@ void wslay_event_config_set_max_recv_msg_length(wslay_event_context_ptr ctx, uint64_t val); /* - * Sets callbacks to ctx. The callbacks previouly set by this function + * Sets callbacks to ctx. The callbacks previously set by this function * or wslay_event_context_server_init() or * wslay_event_context_client_init() are replaced with callbacks. */ diff --git a/thirdparty/wslay/wslay_frame.c b/thirdparty/wslay/wslay_frame.c index 435044a3f42..fa065eea4cb 100644 --- a/thirdparty/wslay/wslay_frame.c +++ b/thirdparty/wslay/wslay_frame.c @@ -109,7 +109,7 @@ ssize_t wslay_frame_send(wslay_frame_context_ptr ctx, int flags = 0; if (iocb->data_length > 0) { flags |= WSLAY_MSG_MORE; - }; + } r = ctx->callbacks.send_callback(ctx->oheadermark, (size_t)len, flags, ctx->user_data); if (r > 0) {