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/murmur/ServerUser.h | |
parent | 713b92c3c233f8f38200c4a458e0196d3d39a3b0 (diff) | |
parent | 15831dbca85dd906edbad2bfff2b147527a456e2 (diff) |
Merge PR #3644: Don't include PCH headers directly, add missing includes
Diffstat (limited to 'src/murmur/ServerUser.h')
-rw-r--r-- | src/murmur/ServerUser.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/murmur/ServerUser.h b/src/murmur/ServerUser.h index 09dee4dcb..c0766594c 100644 --- a/src/murmur/ServerUser.h +++ b/src/murmur/ServerUser.h @@ -6,13 +6,10 @@ #ifndef MUMBLE_MURMUR_SERVERUSER_H_ #define MUMBLE_MURMUR_SERVERUSER_H_ -#include <QtCore/QStringList> -#include <QtCore/QTime> +#include <QtCore/QtGlobal> -#ifdef Q_OS_UNIX -#include <sys/socket.h> -#else -#include <winsock2.h> +#ifdef Q_OS_WIN +# include "win.h" #endif #include "Connection.h" @@ -20,6 +17,15 @@ #include "User.h" #include "HostAddress.h" +#include <QtCore/QStringList> +#include <QtCore/QTime> + +#ifdef Q_OS_WIN +# include <winsock2.h> +#else +# include <sys/socket.h> +#endif + // Unfortunately, this needs to be "large enough" to hold // enough frames to account for both short-term and // long-term "maladjustments". |