From b1477e98f63b151b29d7b1f4f0e916181da7eeb6 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 13 Dec 2019 08:44:51 -0500
Subject: [PATCH] DRTVWR-494: Fix Windows macro collisions in
windows_volume_catcher by tweaking #include order.
---
indra/media_plugins/cef/windows_volume_catcher.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/indra/media_plugins/cef/windows_volume_catcher.cpp b/indra/media_plugins/cef/windows_volume_catcher.cpp
index 6953ad3ab8a..7a36123a116 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);
--
GitLab