瀏覽代碼

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).
Fabio Alessandrelli 7 年之前
父節點
當前提交
308b03b377
共有 2 個文件被更改,包括 7 次插入0 次删除
  1. 2 0
      thirdparty/README.md
  2. 5 0
      thirdparty/lws/mbedtls_wrapper/include/platform/ssl_port.h

+ 2 - 0
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.

+ 5 - 0
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);