diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2018-06-07 15:35:04 +0200 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2018-06-07 18:07:35 +0200 |
| commit | 333e398413c87b06cef8391a898208260c5df3a6 (patch) | |
| tree | 530ac909f979b11c87df29672e7debeab127176a /thirdparty | |
| parent | e56a3c1dc4e08be35b0740808f71444c41072203 (diff) | |
Add libwebsocket 3.0 BSD fix
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/README.md | 2 | ||||
| -rw-r--r-- | thirdparty/libwebsockets/libwebsockets.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/thirdparty/README.md b/thirdparty/README.md index 9c97d460ed..d30b70fede 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 <sys/socket.h>` 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 bac430d12a..7ae563d582 100644 --- a/thirdparty/libwebsockets/libwebsockets.h +++ b/thirdparty/libwebsockets/libwebsockets.h @@ -106,7 +106,8 @@ typedef unsigned long long lws_intptr_t; #include <sys/capability.h> #endif -#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__QNX__) +#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__QNX__) || defined(__OpenBSD__) +#include <sys/socket.h> #include <netinet/in.h> #endif |