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:
Diffstat (limited to 'src/mumble/Cert.cpp')
-rw-r--r--src/mumble/Cert.cpp16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/mumble/Cert.cpp b/src/mumble/Cert.cpp
index 43f5b9fc0..fabcfb956 100644
--- a/src/mumble/Cert.cpp
+++ b/src/mumble/Cert.cpp
@@ -11,12 +11,22 @@
# pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
-#include "mumble_pch.hpp"
-
#include "Cert.h"
-#include "Global.h"
#include "SelfSignedCertificate.h"
+#include "Utils.h"
+
+#include <QtCore/QUrl>
+#include <QtGui/QDesktopServices>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QToolTip>
+
+#include <openssl/evp.h>
+#include <openssl/pkcs12.h>
+#include <openssl/x509.h>
+
+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
+#include "Global.h"
#define SSL_STRING(x) QString::fromLatin1(x).toUtf8().data()