summaryrefslogtreecommitdiff
path: root/indra/media_plugins
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2021-10-14 00:35:08 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2021-10-14 00:35:08 +0300
commitfb170ffe2102f7245037a8b1eeb39db7ec8d5820 (patch)
tree0687368ffd56c450f490b317f21ef9a4a0197a67 /indra/media_plugins
parent1e7fd6302aa39f1a011e2e4d711bca7a88a62076 (diff)
parentcbaba2df56c66926e051d50b6cb02955c81c2a6c (diff)
Merge branch 'master' into DRTVWR-545-maint-mix
Diffstat (limited to 'indra/media_plugins')
-rw-r--r--indra/media_plugins/libvlc/media_plugin_libvlc.cpp5
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"