diff options
Diffstat (limited to 'src/corelib/tools/qmessageauthenticationcode.cpp')
| -rw-r--r-- | src/corelib/tools/qmessageauthenticationcode.cpp | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/src/corelib/tools/qmessageauthenticationcode.cpp b/src/corelib/tools/qmessageauthenticationcode.cpp index ada502ecb8..addd19d72e 100644 --- a/src/corelib/tools/qmessageauthenticationcode.cpp +++ b/src/corelib/tools/qmessageauthenticationcode.cpp @@ -42,39 +42,7 @@ #include "qtcore-config_p.h" -/* - These #defines replace the typedefs needed by the RFC6234 code. Normally - the typedefs would come from from stdint.h, but since this header is not - available on all platforms (MSVC 2008, for example), we #define them to the - Qt equivalents. -*/ - -#ifdef uint64_t -#undef uint64_t -#endif - -#define uint64_t QT_PREPEND_NAMESPACE(quint64) - -#ifdef uint32_t -#undef uint32_t -#endif - -#define uint32_t QT_PREPEND_NAMESPACE(quint32) - -#ifdef uint8_t -#undef uint8_t -#endif - -#define uint8_t QT_PREPEND_NAMESPACE(quint8) - -#ifdef int_least16_t -#undef int_least16_t -#endif - -#define int_least16_t QT_PREPEND_NAMESPACE(qint16) - -// Header from rfc6234 with 1 modification: -// sha1.h - commented out '#include <stdint.h>' on line 74 +// Header from rfc6234 #include "../../3rdparty/rfc6234/sha.h" #if QT_CONFIG(system_libb2) @@ -83,11 +51,6 @@ #include "../../3rdparty/blake2/src/blake2.h" #endif -#undef uint64_t -#undef uint32_t -#undef uint68_t -#undef int_least16_t - QT_BEGIN_NAMESPACE static int qt_hash_block_size(QCryptographicHash::Algorithm method) |