diff options
author | Dave Houlton <euclid@lindenlab.com> | 2021-10-13 15:28:53 -0600 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2021-10-13 15:28:53 -0600 |
commit | e989b79dae7b7128c6ce4580b6731dcd3347b94e (patch) | |
tree | 72c71a57659a7068f291426cb5235cb68d3436c9 /indra/media_plugins/libvlc/media_plugin_libvlc.cpp | |
parent | 492ea7c3a03d5ef0d3679b873a44c08baaced0f1 (diff) | |
parent | cbaba2df56c66926e051d50b6cb02955c81c2a6c (diff) |
Merge branch 'master' into DRTVWR-528
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" |