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
path: root/src/win.h
diff options
context:
space:
mode:
authorDavide Beatrici <davidebeatrici@gmail.com>2019-09-12 23:08:39 +0300
committerDavide Beatrici <davidebeatrici@gmail.com>2019-09-12 23:08:39 +0300
commit15831dbca85dd906edbad2bfff2b147527a456e2 (patch)
tree34bd1c4db9b95748d263aea811e849dec7e5525c /src/win.h
parente29897c784f546dc8c7150811994663818911608 (diff)
Add missing includes for "no-pch" build
This commit adds all the missing includes when the PCH header is not used. Also, some includes are reordered and/or made consistent (e.g. "#include <QtEndian>" -> "#include <QtCore/QtEndian>").
Diffstat (limited to 'src/win.h')
-rw-r--r--src/win.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/win.h b/src/win.h
index 0a9e1d58b..aaeb1a7db 100644
--- a/src/win.h
+++ b/src/win.h
@@ -37,7 +37,11 @@
# undef NTDDI_VERSION
# define NTDDI_VERSION NTDDI_WIN7
# endif
+#endif
+
+#include <windows.h>
+#ifdef __MINGW32__
// MinGW's <qos2.h> header does not provide everything we need,
// so define QOS_FLOWID (and PQOS_FLOWID) as well as QOS_NON_ADAPTIVE_FLOW
// ourselves to allow us to build with QoS support on MinGW.
@@ -47,6 +51,4 @@ typedef UINT32 QOS_FLOWID, *PQOS_FLOWID;
# endif
#endif
-#include <windows.h>
-
#endif // MUMBLE_WIN_H_