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. (cherry picked from commitadfc46db4d
)
This commit is contained in:
parent
88e60dd625
commit
c320b2a181
4 changed files with 14 additions and 6 deletions
4
thirdparty/README.md
vendored
4
thirdparty/README.md
vendored
|
@ -568,7 +568,7 @@ folder.
|
|||
## 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:
|
||||
|
@ -585,7 +585,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:
|
||||
|
|
12
thirdparty/wslay/config.h
vendored
12
thirdparty/wslay/config.h
vendored
|
@ -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 */
|
||||
|
|
2
thirdparty/wslay/wslay/wslay.h
vendored
2
thirdparty/wslay/wslay/wslay.h
vendored
|
@ -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.
|
||||
*/
|
||||
|
|
2
thirdparty/wslay/wslay_frame.c
vendored
2
thirdparty/wslay/wslay_frame.c
vendored
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue