Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/mumble/DirectSound.cpp')
-rw-r--r--src/mumble/DirectSound.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/mumble/DirectSound.cpp b/src/mumble/DirectSound.cpp
index 2185e2bec..5ced0f04e 100644
--- a/src/mumble/DirectSound.cpp
+++ b/src/mumble/DirectSound.cpp
@@ -3,7 +3,13 @@
// that can be found in the LICENSE file at the root of the
// Mumble source tree or at <https://www.mumble.info/LICENSE>.
-#include "mumble_pch.hpp"
+#include "DirectSound.h"
+
+#include "MainWindow.h"
+#include "Plugins.h"
+#include "User.h"
+
+#include "win.h"
#define DIRECTSOUND_VERSION 0x1000
@@ -12,11 +18,7 @@
#include <ks.h>
#include <ksmedia.h>
-#include "DirectSound.h"
-
-#include "MainWindow.h"
-#include "Plugins.h"
-#include "User.h"
+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
#include "Global.h"
// from os_win.cpp