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/Global.cpp')
-rw-r--r--src/mumble/Global.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/mumble/Global.cpp b/src/mumble/Global.cpp
index f10846b6e..41ec60e17 100644
--- a/src/mumble/Global.cpp
+++ b/src/mumble/Global.cpp
@@ -3,8 +3,15 @@
// 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 "MumbleApplication.h"
+#include <QtCore/QStandardPaths>
+
+#ifdef Q_OS_WIN
+# include <shlobj.h>
+#endif
+
+// 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"
Global *Global::g_global_struct;