diff options
Diffstat (limited to 'src/mumble/GlobalShortcut_unix.cpp')
| -rw-r--r-- | src/mumble/GlobalShortcut_unix.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mumble/GlobalShortcut_unix.cpp b/src/mumble/GlobalShortcut_unix.cpp index e7516d4b6..6ef82bf1f 100644 --- a/src/mumble/GlobalShortcut_unix.cpp +++ b/src/mumble/GlobalShortcut_unix.cpp @@ -3,13 +3,16 @@ // 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 "GlobalShortcut_unix.h" -#include "Global.h" #include "Settings.h" +#include <QtCore/QFileSystemWatcher> +#include <QtCore/QSocketNotifier> + +// 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" + // We have to use a global 'diagnostic ignored' pragmas because // we still support old versions of GCC. (FreeBSD 9.3 ships with GCC 4.2) #if defined (__GNUC__) |