diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-10-14 00:52:00 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-10-14 00:52:00 +0300 |
| commit | f9e7e59405a161828ec5dde624299b8aa67dc5b7 (patch) | |
| tree | 227aae383792ddcae99e70aad41c7f97edcd8e59 /indra/media_plugins | |
| parent | 9d6f7363cb26f4d77210109fe2b0cd90a2f4ab71 (diff) | |
| parent | cbaba2df56c66926e051d50b6cb02955c81c2a6c (diff) | |
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
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" |