From 333e398413c87b06cef8391a898208260c5df3a6 Mon Sep 17 00:00:00 2001 From: Fabio Alessandrelli Date: Thu, 7 Jun 2018 15:35:04 +0200 Subject: [PATCH] Add libwebsocket 3.0 BSD fix --- thirdparty/README.md | 2 ++ thirdparty/libwebsockets/libwebsockets.h | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/thirdparty/README.md b/thirdparty/README.md index 9c97d460ed0..d30b70fede9 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -252,6 +252,8 @@ File extracted from upstream source: - From `roles/ws` exclude `ext` folder. - From `tls` exclude `openssl` folder. - Also copy `win32helpers/` from `win32port/` inside `thirdparty/libwebsockets` +- A small fix has been added in `libwebsockets/libwebsockets.h` to `#include ` for the BSD family. + This change has been PRed upstream, and should be merged before the next update. Remember to check and remove this line. Important: `lws_config.h` and `lws_config_private.h` contains custom Godot build configurations, check them out when updating. diff --git a/thirdparty/libwebsockets/libwebsockets.h b/thirdparty/libwebsockets/libwebsockets.h index bac430d12a1..7ae563d5827 100644 --- a/thirdparty/libwebsockets/libwebsockets.h +++ b/thirdparty/libwebsockets/libwebsockets.h @@ -106,7 +106,8 @@ typedef unsigned long long lws_intptr_t; #include #endif -#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__QNX__) +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__QNX__) || defined(__OpenBSD__) +#include #include #endif