Small change to lws mbedtls_wrapper
to fix OSX build.
Checks for OSX in thirdparty/lws/mbedtls_wrapper/include/platform/ssl_port.h to include stdlib.h instead of malloc.h. The bug is fixed upstream in master via LWS_HAVE_MALLOC_H, but not in the 2.4.1 branch (as the file structure has, one again, changed).
This commit is contained in:
parent
34b9fc3022
commit
308b03b377
2
thirdparty/README.md
vendored
2
thirdparty/README.md
vendored
|
@ -230,6 +230,8 @@ File extracted from upstream source:
|
||||||
- From `server/` exclude `access-log.c`, `cgi.c`, `daemonize.c`, `lws-spa.c`,
|
- From `server/` exclude `access-log.c`, `cgi.c`, `daemonize.c`, `lws-spa.c`,
|
||||||
`peer-limits.c`, `rewrite.c`
|
`peer-limits.c`, `rewrite.c`
|
||||||
- Also copy `win32helpers/` from `win32port/`
|
- 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
|
Important: `lws_config.h` and `lws_config_private.h` contains custom
|
||||||
Godot build configurations, check them out when updating.
|
Godot build configurations, check them out when updating.
|
||||||
|
|
|
@ -24,7 +24,12 @@
|
||||||
#include "esp_log.h"
|
#include "esp_log.h"
|
||||||
*/
|
*/
|
||||||
#include "string.h"
|
#include "string.h"
|
||||||
|
|
||||||
|
#ifdef __APPLE__
|
||||||
|
#include <stdlib.h>
|
||||||
|
#else
|
||||||
#include "malloc.h"
|
#include "malloc.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
void *ssl_mem_zalloc(size_t size);
|
void *ssl_mem_zalloc(size_t size);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue