summaryrefslogtreecommitdiff
path: root/thirdparty/lws
diff options
context:
space:
mode:
authorFabio Alessandrelli <fabio.alessandrelli@gmail.com>2018-02-08 22:07:01 +0100
committerFabio Alessandrelli <fabio.alessandrelli@gmail.com>2018-02-14 01:26:23 +0100
commit308b03b377fc0001542ad4cfe876fca3c2f49a00 (patch)
treef72eb4715e9c8f6f9b67da3a9be2d208b6dd4c77 /thirdparty/lws
parent34b9fc3022ca2e1b756d2e8a433bd4813531fe98 (diff)
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).
Diffstat (limited to 'thirdparty/lws')
-rw-r--r--thirdparty/lws/mbedtls_wrapper/include/platform/ssl_port.h5
1 files changed, 5 insertions, 0 deletions
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);