godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wslay: Sync with upstream 0e7d106ff 

0e7d106ff8

Just a couple style fixes. Updating only so we know we don't have to review changes
since upstream development seems dormant.
This commit is contained in:
Rémi Verschelde 2023-05-22 14:42:26 +02:00
parent 65fa775ff6
commit adfc46db4d
No known key found for this signature in database
GPG Key ID: C3336907360768E1
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
thirdparty/README.md vendored
View File

@ -774,7 +774,7 @@ Patches in the `patches` directory should be re-applied after updates.
## wslay ## wslay
- Upstream: https://github.com/tatsuhiro-t/wslay - Upstream: https://github.com/tatsuhiro-t/wslay
- Version: 1.1.1+git (45d22583b488f79d5a4e598cc7675c191c5ab53f, 2021) - Version: 1.1.1+git (0e7d106ff89ad6638090fd811a9b2e4c5dda8d40, 2022)
- License: MIT - License: MIT
File extracted from upstream release tarball: File extracted from upstream release tarball:
@ -791,7 +791,7 @@ File extracted from upstream release tarball:
## xatlas ## xatlas
- Upstream: https://github.com/jpcy/xatlas - Upstream: https://github.com/jpcy/xatlas
- Version: git (16ace528acd2cf1f16a7c0dde99c42c486488dbe, 2022) - Version: git (f700c7790aaa030e794b52ba7791a05c085faf0c, 2022)
- License: MIT - License: MIT
Files extracted from upstream source: Files extracted from upstream source:

12
thirdparty/wslay/config.h vendored
View File

@ -1,10 +1,18 @@
#ifndef CONFIG_H #ifndef CONFIG_H
#define 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 #ifdef BIG_ENDIAN_ENABLED
#define WORDS_BIGENDIAN #define WORDS_BIGENDIAN
#endif #endif
// -- GODOT end --
#endif /* CONFIG_H */ #endif /* CONFIG_H */

2
thirdparty/wslay/wslay/wslay.h vendored
View File

@ -485,7 +485,7 @@ void wslay_event_config_set_max_recv_msg_length(wslay_event_context_ptr ctx,
uint64_t val); 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 * or wslay_event_context_server_init() or
* wslay_event_context_client_init() are replaced with callbacks. * wslay_event_context_client_init() are replaced with callbacks.
*/ */

2
thirdparty/wslay/wslay_frame.c vendored
View File

@ -109,7 +109,7 @@ ssize_t wslay_frame_send(wslay_frame_context_ptr ctx,
int flags = 0; int flags = 0;
if (iocb->data_length > 0) { if (iocb->data_length > 0) {
flags |= WSLAY_MSG_MORE; flags |= WSLAY_MSG_MORE;
}; }
r = ctx->callbacks.send_callback(ctx->oheadermark, (size_t)len, flags, r = ctx->callbacks.send_callback(ctx->oheadermark, (size_t)len, flags,
ctx->user_data); ctx->user_data);
if (r > 0) { if (r > 0) {