From b0bb791e4ae8e280907295f92fa8e27e1c481737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 6 Aug 2021 10:32:02 +0200 Subject: [PATCH] HTML5: Fix a couple warnings Add a missing call to disable warnings on a forked env for freetype's `sfnt.c`. (cherry picked from commit c44ebb020d633e0e375a2d6d6ca6c1ba09e79111) (cherry picked from commit 0142a378c68fb939c484a36979d986554e32f31f) --- modules/freetype/SCsub | 1 + modules/websocket/emws_peer.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/freetype/SCsub b/modules/freetype/SCsub index cc0fcaa1169..47fbf8ae8cf 100644 --- a/modules/freetype/SCsub +++ b/modules/freetype/SCsub @@ -82,6 +82,7 @@ if env["builtin_freetype"]: # Forcibly undefine this macro so SIMD is not used in this file, # since currently unsupported in WASM tmp_env = env_freetype.Clone() + tmp_env.disable_warnings() tmp_env.Append(CPPFLAGS=["-U__OPTIMIZE__"]) sfnt = tmp_env.Object(sfnt) thirdparty_sources += [sfnt] diff --git a/modules/websocket/emws_peer.cpp b/modules/websocket/emws_peer.cpp index 029f4cfe099..0ca360687e0 100644 --- a/modules/websocket/emws_peer.cpp +++ b/modules/websocket/emws_peer.cpp @@ -55,7 +55,7 @@ Error EMWSPeer::read_msg(const uint8_t *p_data, uint32_t p_size, bool p_is_strin } Error EMWSPeer::put_packet(const uint8_t *p_buffer, int p_buffer_size) { - ERR_FAIL_COND_V(_out_buf_size && (godot_js_websocket_buffered_amount(peer_sock) >= (1ULL << _out_buf_size)), ERR_OUT_OF_MEMORY); + ERR_FAIL_COND_V(_out_buf_size && ((uint64_t)godot_js_websocket_buffered_amount(peer_sock) >= (1ULL << _out_buf_size)), ERR_OUT_OF_MEMORY); int is_bin = write_mode == WebSocketPeer::WRITE_MODE_BINARY ? 1 : 0;