diff options
| author | Vicente Olivert Riera <Vincent.Riera@imgtec.com> | 2013-12-02 13:59:34 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-05 14:15:19 +0100 |
| commit | cea101bd10cc158b97d5fbf45b33dad9b649c08b (patch) | |
| tree | 78179e96ad4c72d2e34627807f7e2fe68fc6db7f /src | |
| parent | 1782fc1e07619a509ca490b55f0a946537e70b97 (diff) | |
qtbase: Fix build error on 64bit BigEndian platforms
The functions fromBytesToWord() and fromWordToBytes() are called when
building on 64bit BigEndian platforms. It fails because those
functions are disabled on the source code. Enabling those functions for
64bit BigEndian platforms fixes the problem.
Task-number: QTBUG-35228
Change-Id: I5ccacd4fb5051df05f67c8da879b3a9e49953861
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src')
| -rw-r--r--[-rwxr-xr-x] | src/3rdparty/sha3/KeccakF-1600-opt64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/sha3/KeccakF-1600-opt64.c b/src/3rdparty/sha3/KeccakF-1600-opt64.c index 7bd442ef69..a547bb5a89 100755..100644 --- a/src/3rdparty/sha3/KeccakF-1600-opt64.c +++ b/src/3rdparty/sha3/KeccakF-1600-opt64.c @@ -328,7 +328,7 @@ static void KeccakPermutation(unsigned char *state) KeccakPermutationOnWords((UINT64*)state); } -#if 0 // Unused in the Qt configuration +#if (PLATFORM_BYTE_ORDER == IS_BIG_ENDIAN) static void fromBytesToWord(UINT64 *word, const UINT8 *bytes) { unsigned int i; @@ -449,7 +449,7 @@ static void KeccakAbsorb(unsigned char *state, const unsigned char *data, unsign #endif } -#if 0 // Unused in the Qt configuration +#if (PLATFORM_BYTE_ORDER == IS_BIG_ENDIAN) static void fromWordToBytes(UINT8 *bytes, const UINT64 word) { unsigned int i; |