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.h | |
parent | 713b92c3c233f8f38200c4a458e0196d3d39a3b0 (diff) | |
parent | 15831dbca85dd906edbad2bfff2b147527a456e2 (diff) |
Merge PR #3644: Don't include PCH headers directly, add missing includes
Diffstat (limited to 'src/Connection.h')
-rw-r--r-- | src/Connection.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/Connection.h b/src/Connection.h index 307f98ef9..534d2b8e8 100644 --- a/src/Connection.h +++ b/src/Connection.h @@ -7,21 +7,29 @@ #define MUMBLE_CONNECTION_H_ #include <QtCore/QtGlobal> + +#ifdef Q_OS_WIN +# include "win.h" +#endif + +#include "CryptState.h" + #include <QtCore/QMutex> + #if QT_VERSION >= 0x040700 -#include <QtCore/QElapsedTimer> +# include <QtCore/QElapsedTimer> #else -#include <QtCore/QTime> +# include <QtCore/QTime> #endif + #include <QtCore/QList> #include <QtCore/QObject> #include <QtNetwork/QSslSocket> + #ifdef Q_OS_WIN -#include <windows.h> +# include <ws2tcpip.h> #endif -#include "CryptState.h" - namespace google { namespace protobuf { class Message; |