diff options
Diffstat (limited to 'src/mumble/Overlay_win.cpp')
| -rw-r--r-- | src/mumble/Overlay_win.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mumble/Overlay_win.cpp b/src/mumble/Overlay_win.cpp index 56666f50c..c3f0597ee 100644 --- a/src/mumble/Overlay_win.cpp +++ b/src/mumble/Overlay_win.cpp @@ -3,21 +3,21 @@ // 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 "Overlay.h" #include "User.h" #include "Channel.h" #include "OverlayConfig.h" #include "MainWindow.h" -#include "Global.h" #include "MumbleApplication.h" #include "Overlay_win.h" #include "../../overlay/overlay_exe/overlay_exe.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" + // Used by the overlay to detect whether we injected into ourselves. // // A similar declaration can be found in mumble_exe's Overlay.cpp, |