summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Alessandrelli <fabio.alessandrelli@gmail.com>2018-02-28 18:08:20 +0100
committerFabio Alessandrelli <fabio.alessandrelli@gmail.com>2018-02-28 18:09:43 +0100
commitea7af81460ac3322519bf840612e009da0047db6 (patch)
tree5082d120583fc5dc528d7b7745054d4fed5c4fc7
parent3d03bcd0636aacfe530c52fc1cdc32c2edffea04 (diff)
Fix lws compilation on FreeBSD, same as OSX
This error is actually fixed upstream, waiting for a new release
-rw-r--r--thirdparty/README.md2
-rw-r--r--thirdparty/lws/mbedtls_wrapper/include/platform/ssl_port.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/thirdparty/README.md b/thirdparty/README.md
index ff05f3d084..746422cab4 100644
--- a/thirdparty/README.md
+++ b/thirdparty/README.md
@@ -235,7 +235,7 @@ 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`).
+- `mbedtls_wrapper/include/platform/ssl_port.h` has a small change to check for OSX and FreeBSD (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
diff --git a/thirdparty/lws/mbedtls_wrapper/include/platform/ssl_port.h b/thirdparty/lws/mbedtls_wrapper/include/platform/ssl_port.h
index fd461e9819..2ffd7e7544 100644
--- a/thirdparty/lws/mbedtls_wrapper/include/platform/ssl_port.h
+++ b/thirdparty/lws/mbedtls_wrapper/include/platform/ssl_port.h
@@ -25,7 +25,7 @@
*/
#include "string.h"
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__FreeBSD__)
#include <stdlib.h>
#else
#include "malloc.h"