AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rtems: Fix build sha3 (undef ALIGN)

Browse Source 
ALIGN macro exists in RTEMS system headers and in sha3 library.

Change-Id: I00cbb5be5598a6a6ca1f011f199da62d658ef9d5
Reviewed-by: Ryan Chu <ryan.chu@qt.io>
This commit is contained in:
Mikhail Svetkin 2018-03-20 14:20:23 +01:00
parent de752e8994
commit a76ae0a631
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/tools/qcryptographichash.cpp
View File

@ -58,6 +58,10 @@ typedef unsigned char BitSequence;
typedef unsigned long long DataLength; typedef unsigned long long DataLength;
typedef enum { SUCCESS = 0, FAIL = 1, BAD_HASHLEN = 2 } HashReturn; typedef enum { SUCCESS = 0, FAIL = 1, BAD_HASHLEN = 2 } HashReturn;
#ifdef Q_OS_RTEMS
# undef ALIGN
#endif
#include "../../3rdparty/sha3/KeccakSponge.c" #include "../../3rdparty/sha3/KeccakSponge.c"
typedef spongeState hashState; typedef spongeState hashState;