diff options
author | Davide Beatrici <davidebeatrici@gmail.com> | 2019-09-12 23:44:16 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-12 23:44:16 +0300 |
commit | a38d19a7595c3e672f5ed549400b36348e01e442 (patch) | |
tree | 34bd1c4db9b95748d263aea811e849dec7e5525c /src/Connection.cpp | |
parent | 713b92c3c233f8f38200c4a458e0196d3d39a3b0 (diff) | |
parent | 15831dbca85dd906edbad2bfff2b147527a456e2 (diff) |
Merge PR #3644: Don't include PCH headers directly, add missing includes
Diffstat (limited to 'src/Connection.cpp')
-rw-r--r-- | src/Connection.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/Connection.cpp b/src/Connection.cpp index 4c07c54de..885322e82 100644 --- a/src/Connection.cpp +++ b/src/Connection.cpp @@ -3,20 +3,22 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at <https://www.mumble.info/LICENSE>. -#include "murmur_pch.h" - -#ifdef Q_OS_UNIX -#include <sys/socket.h> -#include <sys/types.h> -#include <netinet/in.h> -#include <netinet/tcp.h> -#endif - #include "Connection.h" #include "Message.h" #include "SSL.h" #include "Mumble.pb.h" +#include <QtCore/QtEndian> +#include <QtNetwork/QHostAddress> + +#ifdef Q_OS_WIN +# include <qos2.h> +#else +# include <sys/socket.h> +# include <sys/types.h> +# include <netinet/in.h> +# include <netinet/tcp.h> +#endif #ifdef Q_OS_WIN HANDLE Connection::hQoS = NULL; |