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
diff options
context:
space:
mode:
authorDavide Beatrici <davidebeatrici@gmail.com>2019-09-12 23:44:16 +0300
committerGitHub <noreply@github.com>2019-09-12 23:44:16 +0300
commita38d19a7595c3e672f5ed549400b36348e01e442 (patch)
tree34bd1c4db9b95748d263aea811e849dec7e5525c /src/CryptState.cpp
parent713b92c3c233f8f38200c4a458e0196d3d39a3b0 (diff)
parent15831dbca85dd906edbad2bfff2b147527a456e2 (diff)
Merge PR #3644: Don't include PCH headers directly, add missing includes
Diffstat (limited to 'src/CryptState.cpp')
-rw-r--r--src/CryptState.cpp15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/CryptState.cpp b/src/CryptState.cpp
index fbe97c5af..2a1bc90a1 100644
--- a/src/CryptState.cpp
+++ b/src/CryptState.cpp
@@ -12,12 +12,25 @@
* OCB with something else or get yourself a license.
*/
-#include "murmur_pch.h"
+#include <QtCore/QtGlobal>
+
+#ifndef __LP64__
+# ifdef Q_OS_WIN
+# include "win.h"
+# include <winsock2.h>
+# else
+# include <arpa/inet.h>
+# endif
+#endif
#include "CryptState.h"
#include "ByteSwap.h"
+#include <cstring>
+
+#include <openssl/rand.h>
+
CryptState::CryptState() {
for (int i=0;i<0x100;i++)
decrypt_history[i] = 0;