diff options
author | Mikhail Svetkin <mikhail.svetkin@qt.io> | 2018-03-20 14:20:23 +0100 |
---|---|---|
committer | Mikhail Svetkin <mikhail.svetkin@qt.io> | 2019-06-06 09:55:22 +0200 |
commit | a76ae0a631c8387bc96ec7d358e14f6c86b73f35 (patch) | |
tree | 249634435388b7ab55db2c1b62ac125efc966b28 | |
parent | de752e8994220639b2934b769e83bab0e56a00c9 (diff) |
rtems: Fix build sha3 (undef ALIGN)
ALIGN macro exists in RTEMS system headers and in sha3 library.
Change-Id: I00cbb5be5598a6a6ca1f011f199da62d658ef9d5
Reviewed-by: Ryan Chu <ryan.chu@qt.io>
-rw-r--r-- | src/corelib/tools/qcryptographichash.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/tools/qcryptographichash.cpp b/src/corelib/tools/qcryptographichash.cpp index 3c79bb797d..ee7657789c 100644 --- a/src/corelib/tools/qcryptographichash.cpp +++ b/src/corelib/tools/qcryptographichash.cpp @@ -58,6 +58,10 @@ typedef unsigned char BitSequence; typedef unsigned long long DataLength; typedef enum { SUCCESS = 0, FAIL = 1, BAD_HASHLEN = 2 } HashReturn; +#ifdef Q_OS_RTEMS +# undef ALIGN +#endif + #include "../../3rdparty/sha3/KeccakSponge.c" typedef spongeState hashState; |