diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-10-13 14:47:06 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-10-13 14:47:06 -0700 |
| commit | 8a1bc1b9e299077a77bc8498555667adcb387655 (patch) | |
| tree | 4b5a8b329148e5bd86bec785edda6a6f79016d37 /indra/media_plugins | |
| parent | c50db007dfdeecae5c3451fbb188584588c23c47 (diff) | |
| parent | cbaba2df56c66926e051d50b6cb02955c81c2a6c (diff) | |
Merge with head of Master after a new Viewer release
Diffstat (limited to 'indra/media_plugins')
| -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" |