omemo: Fix build on MSVC 2019 (#550)

4 files changed, 14 insertions, 4 deletions

diff --git a/src/omemo/QXmppOmemoData.cpp b/src/omemo/QXmppOmemoData.cpp
index d457326a..6bc1815b 100644
--- a/src/omemo/QXmppOmemoData.cpp
+++ b/src/omemo/QXmppOmemoData.cpp
@@ -3,7 +3,6 @@
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include "QXmppConstants_p.h"
 #include "QXmppOmemoDeviceBundle_p.h"
 #include "QXmppOmemoDeviceElement_p.h"
 #include "QXmppOmemoDeviceList_p.h"
@@ -14,6 +13,8 @@
 #include <QDomElement>
 #include <QHash>
 
+const char *ns_omemo_2 = "urn:xmpp:omemo:2";
+
 /// \cond
 ///
 /// \class QXmppOmemoDeviceElement
diff --git a/src/omemo/QXmppOmemoManager.cpp b/src/omemo/QXmppOmemoManager.cpp
index 8af588d1..7ad511e0 100644
--- a/src/omemo/QXmppOmemoManager.cpp
+++ b/src/omemo/QXmppOmemoManager.cpp
@@ -14,6 +14,9 @@
 
 #include <QStringBuilder>
 
+#undef max
+#undef interface
+
 using namespace QXmpp;
 using namespace QXmpp::Private;
 using namespace QXmpp::Omemo::Private;
diff --git a/src/omemo/QXmppOmemoManager_p.cpp b/src/omemo/QXmppOmemoManager_p.cpp
index f3b71545..8da77f5f 100644
--- a/src/omemo/QXmppOmemoManager_p.cpp
+++ b/src/omemo/QXmppOmemoManager_p.cpp
@@ -27,6 +27,9 @@
 #endif
 #include <QStringBuilder>
 
+#undef max
+#undef interface
+
 using namespace QXmpp;
 using namespace QXmpp::Private;
 using namespace QXmpp::Omemo::Private;
diff --git a/src/omemo/QXmppOmemoManager_p.h b/src/omemo/QXmppOmemoManager_p.h
index db488023..01a372a7 100644
--- a/src/omemo/QXmppOmemoManager_p.h
+++ b/src/omemo/QXmppOmemoManager_p.h
@@ -18,6 +18,8 @@
 #include <QTimer>
 #include <QtCrypto>
 
+#undef max
+
 class QXmppTrustManager;
 class QXmppOmemoManager;
 class QXmppPubSubManager;
@@ -171,9 +173,10 @@ public:
     QXmppOmemoManagerPrivate(QXmppOmemoManager *parent, QXmppOmemoStorage *omemoStorage);
 
     void init();
-    bool initGlobalContext();
-    bool initLocking();
-    bool initCryptoProvider();
+    // exports for unit tests
+    QXMPP_EXPORT bool initGlobalContext();
+    QXMPP_EXPORT bool initLocking();
+    QXMPP_EXPORT bool initCryptoProvider();
     void initStores();
 
     signal_protocol_identity_key_store createIdentityKeyStore() const;