diff options
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/README.md | 2 | ||||
| -rw-r--r-- | thirdparty/lws/mbedtls_wrapper/include/platform/ssl_port.h | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/thirdparty/README.md b/thirdparty/README.md index fb76688757..21c942e083 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -230,6 +230,8 @@ File extracted from upstream source: - From `server/` exclude `access-log.c`, `cgi.c`, `daemonize.c`, `lws-spa.c`, `peer-limits.c`, `rewrite.c` - Also copy `win32helpers/` from `win32port/` +- `mbedtls_wrapper/include/platform/ssl_port.h` has a small change to check for OSX (missing `malloc.h`). + The bug is fixed in upstream master via `LWS_HAVE_MALLOC_H`, but not in the 2.4.1 branch (as the file structure has changed). Important: `lws_config.h` and `lws_config_private.h` contains custom Godot build configurations, check them out when updating. diff --git a/thirdparty/lws/mbedtls_wrapper/include/platform/ssl_port.h b/thirdparty/lws/mbedtls_wrapper/include/platform/ssl_port.h index c4c266183c..fd461e9819 100644 --- a/thirdparty/lws/mbedtls_wrapper/include/platform/ssl_port.h +++ b/thirdparty/lws/mbedtls_wrapper/include/platform/ssl_port.h @@ -24,7 +24,12 @@ #include "esp_log.h" */ #include "string.h" + +#ifdef __APPLE__ +#include <stdlib.h> +#else #include "malloc.h" +#endif void *ssl_mem_zalloc(size_t size); |