diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2021-10-22 11:54:18 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2021-10-22 11:54:18 -0400 |
| commit | 14dae8bc8ee55fdd027c7232e3dbcf7b7eedd3cc (patch) | |
| tree | 8d84f9c2a7fb2f859f6bb3b1c0dfacc6319cc01e /indra/media_plugins/libvlc | |
| parent | 11afa09ea3f56c0e20eb195ae1520a88602ceaca (diff) | |
| parent | cbaba2df56c66926e051d50b6cb02955c81c2a6c (diff) | |
SL-16220: Merge branch 'master' into sl-16220
Diffstat (limited to 'indra/media_plugins/libvlc')
| -rw-r--r-- | indra/media_plugins/libvlc/media_plugin_libvlc.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp index f7d35b33c2..5d4a488e64 100644 --- a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp +++ b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp @@ -34,6 +34,11 @@ #include "llpluginmessageclasses.h" #include "media_plugin_base.h" +#if defined(_MSC_VER) +#include <basetsd.h> +typedef SSIZE_T ssize_t; +#endif + #include "vlc/vlc.h" #include "vlc/libvlc_version.h" |