diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-12-09 10:13:48 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-09 10:13:48 +0100 |
commit | 25b390256bf2a699231a165e49f4100262ed29ac (patch) | |
tree | 4c3c3cc8dbbe1a523edb26aefd29c22da8732e1f /src/3rdparty | |
parent | bcf346a76659f896a25f31aa44f64ba5f28ba8e1 (diff) | |
parent | f6dbdd9c16166f345fd5743886229192c97c2c4f (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/3rdparty')
-rw-r--r--[-rwxr-xr-x] | src/3rdparty/sha3/KeccakF-1600-opt64.c | 4 | ||||
-rw-r--r-- | src/3rdparty/sqlite.pri | 1 |
2 files changed, 3 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; diff --git a/src/3rdparty/sqlite.pri b/src/3rdparty/sqlite.pri index 58d4ddd9a1..072502c8e9 100644 --- a/src/3rdparty/sqlite.pri +++ b/src/3rdparty/sqlite.pri @@ -1,6 +1,7 @@ CONFIG(release, debug|release):DEFINES *= NDEBUG DEFINES += SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_RTREE !contains(CONFIG, largefile):DEFINES += SQLITE_DISABLE_LFS +contains(QT_CONFIG, posix_fallocate):DEFINES += HAVE_POSIX_FALLOCATE=1 winrt: DEFINES += SQLITE_OS_WINRT INCLUDEPATH += $$PWD/sqlite SOURCES += $$PWD/sqlite/sqlite3.c |