diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-02-28 21:13:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-28 21:13:58 +0100 |
| commit | c6dff58f491c30ffc2a81a8d69da86ff8105053f (patch) | |
| tree | 70a1ec6616f76adbdbed37a84ca7d8bdde602654 /thirdparty | |
| parent | 3d03bcd0636aacfe530c52fc1cdc32c2edffea04 (diff) | |
| parent | 659c62ee338975eddf1f7e65f68190af65199324 (diff) | |
Merge pull request #17115 from Faless/lws_bsd_malloc
Fix mbedTLS and Websocket on FreeBSD
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/README.md | 2 | ||||
| -rw-r--r-- | thirdparty/lws/mbedtls_wrapper/include/platform/ssl_port.h | 2 |
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" |