summaryrefslogtreecommitdiff
path: root/indra/media_plugins/cef
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2019-12-13 08:44:51 -0500
committerNat Goodspeed <nat@lindenlab.com>2020-03-25 15:28:17 -0400
commitb1477e98f63b151b29d7b1f4f0e916181da7eeb6 (patch)
treeaf114f0bd9ff9cc6c5c720101a69c7edcd0aacc8 /indra/media_plugins/cef
parent0a9a20a5df5ea7fd8f542e6f865a795a07ce5160 (diff)
DRTVWR-494: Fix Windows macro collisions in windows_volume_catcher
by tweaking #include order.
Diffstat (limited to 'indra/media_plugins/cef')
-rw-r--r--indra/media_plugins/cef/windows_volume_catcher.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/media_plugins/cef/windows_volume_catcher.cpp b/indra/media_plugins/cef/windows_volume_catcher.cpp
index 6953ad3ab8..7a36123a11 100644
--- a/indra/media_plugins/cef/windows_volume_catcher.cpp
+++ b/indra/media_plugins/cef/windows_volume_catcher.cpp
@@ -27,8 +27,9 @@
*/
#include "volume_catcher.h"
-#include <windows.h>
#include "llsingleton.h"
+#include <windows.h>
+#include <mmeapi.h>
class VolumeCatcherImpl : public LLSingleton<VolumeCatcherImpl>
{
LLSINGLETON(VolumeCatcherImpl);