فهرست منبع

Fix lws compilation on FreeBSD, same as OSX

This error is actually fixed upstream, waiting for a new release
Fabio Alessandrelli 7 سال پیش
والد
کامیت
ea7af81460
2فایلهای تغییر یافته به همراه2 افزوده شده و 2 حذف شده
  1. 1 1
      thirdparty/README.md
  2. 1 1
      thirdparty/lws/mbedtls_wrapper/include/platform/ssl_port.h

+ 1 - 1
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`, 
   - 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`).
+- `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).
   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 

+ 1 - 1
thirdparty/lws/mbedtls_wrapper/include/platform/ssl_port.h

@@ -25,7 +25,7 @@
 */
 */
 #include "string.h"
 #include "string.h"
 
 
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__FreeBSD__)
 #include <stdlib.h>
 #include <stdlib.h>
 #else
 #else
 #include "malloc.h"
 #include "malloc.h"