diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2019-07-03 10:52:26 +0200 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2019-07-04 15:03:04 +0200 |
| commit | 9233edd344e20aa4d856687f4ee368ea69a95b6b (patch) | |
| tree | a04ca098c45b4898a4c64d10560346011ed6aa98 | |
| parent | aae6c075aa500abdb9c72fea9bbb85cb4e735e65 (diff) | |
Godot addition to wslay, fixes MSVC build
| -rw-r--r-- | thirdparty/README.md | 5 | ||||
| -rw-r--r-- | thirdparty/wslay/includes/wslay/wslay.h | 6 | ||||
| -rw-r--r-- | thirdparty/wslay/msvcfix.diff | 17 |
3 files changed, 28 insertions, 0 deletions
diff --git a/thirdparty/README.md b/thirdparty/README.md index ebfa5b3b83..dbdf9bbf4f 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -268,6 +268,11 @@ changes are marked with `// -- GODOT --` comments. - Version: 1.1.0 - License: MIT +File extracted from upstream releaze tarball: + +- All `*.c` and `*.h` in `lib/` and `lib/includes/` +- `wslay.h` has a small Godot addition to fix MSVC build. + See `thirdparty/wslay/msvcfix.diff` ## mbedtls diff --git a/thirdparty/wslay/includes/wslay/wslay.h b/thirdparty/wslay/includes/wslay/wslay.h index 2fde81a4e9..9c751b05b7 100644 --- a/thirdparty/wslay/includes/wslay/wslay.h +++ b/thirdparty/wslay/includes/wslay/wslay.h @@ -33,6 +33,12 @@ extern "C" { #include <stdlib.h> #include <sys/types.h> +/* GODOT ADDITTION */ +#if defined(_MSC_VER) +#include <BaseTsd.h> +typedef SSIZE_T ssize_t; +#endif +/* GODOT END */ /* * wslay/wslayver.h is generated from wslay/wslayver.h.in by diff --git a/thirdparty/wslay/msvcfix.diff b/thirdparty/wslay/msvcfix.diff new file mode 100644 index 0000000000..28721844f4 --- /dev/null +++ b/thirdparty/wslay/msvcfix.diff @@ -0,0 +1,17 @@ +diff --git a/thirdparty/wslay/includes/wslay/wslay.h b/thirdparty/wslay/includes/wslay/wslay.h +index 2fde81a4e..9c751b05b 100644 +--- a/thirdparty/wslay/includes/wslay/wslay.h ++++ b/thirdparty/wslay/includes/wslay/wslay.h +@@ -33,6 +33,12 @@ extern "C" { + #include <stdlib.h> + #include <sys/types.h> + ++/* GODOT ADDITTION */ ++#if defined(_MSC_VER) ++#include <BaseTsd.h> ++typedef SSIZE_T ssize_t; ++#endif ++/* GODOT END */ + + /* + * wslay/wslayver.h is generated from wslay/wslayver.h.in by |