From b3db55fa6f2c63fafa421cb217df5038cdd13e98 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Sun, 27 Sep 2020 11:00:54 +0200 Subject: Remove workaround for MSVC 2008 We don't build on platforms without stdint.h Change-Id: Iee9de3e71a7bcae524f2d1377919cf074a713960 Reviewed-by: Thiago Macieira --- src/corelib/tools/qmessageauthenticationcode.cpp | 39 +----------------------- 1 file changed, 1 insertion(+), 38 deletions(-) (limited to 'src/corelib/tools/qmessageauthenticationcode.cpp') diff --git a/src/corelib/tools/qmessageauthenticationcode.cpp b/src/corelib/tools/qmessageauthenticationcode.cpp index ada502ecb83..addd19d72ed 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 ' 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) -- cgit v1.2.3