diff options
Diffstat (limited to 'src/mumble/GlobalShortcut_win.cpp')
| -rw-r--r-- | src/mumble/GlobalShortcut_win.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/mumble/GlobalShortcut_win.cpp b/src/mumble/GlobalShortcut_win.cpp index f6b82cd34..4e5f36447 100644 --- a/src/mumble/GlobalShortcut_win.cpp +++ b/src/mumble/GlobalShortcut_win.cpp @@ -3,21 +3,27 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at <https://www.mumble.info/LICENSE>. +#include "GlobalShortcut_win.h" + +#include "MainWindow.h" +#include "OverlayClient.h" +#include "Utils.h" + // MinGW does not support std::future/std::promise // at present. Use Boost's implementation for now. #define BOOST_THREAD_VERSION 4 #include <boost/thread.hpp> #include <boost/thread/future.hpp> -#include "GlobalShortcut_win.h" - -#include "MainWindow.h" -#include "OverlayClient.h" -#include "Global.h" +#include <QtCore/QElapsedTimer> +#include <QtCore/QTimer> // 3rdparty/xinputcheck-src. #include <xinputcheck.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" + #undef FAILED #define FAILED(Status) (static_cast<HRESULT>(Status)<0) |