diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-10-13 22:58:05 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-10-13 22:58:05 +0000 |
| commit | 42415ab0cf05cbb1c470ae65a2ab7bed005927dd (patch) | |
| tree | 7bed99ca0b8131d067ed0dea01723f6cb7f2456d /indra/media_plugins/libvlc | |
| parent | 75cf90723f63d1d80b2a3b4b8aa9536cadcda8cb (diff) | |
| parent | 6b2e40157b1f103b8394aeffcce2115321943ebf (diff) | |
Merged in DV546-merge-6.4.24 (pull request #731)
DRTVWR-546 merge up to v 6.4.24
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" |