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/CoreAudio.cpp')
-rw-r--r--src/mumble/CoreAudio.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mumble/CoreAudio.cpp b/src/mumble/CoreAudio.cpp
index 5c7cfc6d4..c9300a9c9 100644
--- a/src/mumble/CoreAudio.cpp
+++ b/src/mumble/CoreAudio.cpp
@@ -3,11 +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 "CoreAudio.h"
#include "User.h"
+
+#include <Carbon/Carbon.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"
// Ignore deprecation warnings for the whole file, for now.