diff options
| author | Callum Linden <callum@lindenlab.com> | 2021-10-13 16:54:08 -0700 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2021-10-13 16:54:08 -0700 |
| commit | 3c2ccd879cb59ac0fdcacfab1fe68bc4dcefc68b (patch) | |
| tree | 3a0851d0c1d77fcd6ffa948f9c6199640b7147dd /indra/media_plugins/libvlc/media_plugin_libvlc.cpp | |
| parent | 3a3296f371508c4a31a37053242ee69a574f22f0 (diff) | |
| parent | cbaba2df56c66926e051d50b6cb02955c81c2a6c (diff) | |
Merge with master after latest Viewer release
Diffstat (limited to 'indra/media_plugins/libvlc/media_plugin_libvlc.cpp')
| -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" |