diff options
| author | Linus Jahn <lnj@kaidan.im> | 2023-03-11 00:29:02 +0100 |
|---|---|---|
| committer | Linus Jahn <lnj@kaidan.im> | 2023-03-11 00:29:02 +0100 |
| commit | 463111576fb1476192acd2d8fe415b8482a8a696 (patch) | |
| tree | e87e3bb8f8724f019954692ac22b0d6386dfa5e7 /src/client/QXmppFileEncryption.cpp | |
| parent | 6ea3edfd83a0bf1558d43e48eac563730276c175 (diff) | |
| parent | 4897c9b6a36e961fb44d2bce04a698f979a423d5 (diff) | |
| download | qxmpp-463111576fb1476192acd2d8fe415b8482a8a696.tar.gz | |
Merge branch '1.5'
Diffstat (limited to 'src/client/QXmppFileEncryption.cpp')
| -rw-r--r-- | src/client/QXmppFileEncryption.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/client/QXmppFileEncryption.cpp b/src/client/QXmppFileEncryption.cpp index ba78821e..e767769a 100644 --- a/src/client/QXmppFileEncryption.cpp +++ b/src/client/QXmppFileEncryption.cpp @@ -7,6 +7,8 @@ #include <QByteArray> #include <QtCrypto> +#undef min + using namespace QCA; constexpr std::size_t AES128_BLOCK_SIZE = 128 / 8; |