From f9b4499ccb63ef02d8c9de462fbbcf301eb1907a Mon Sep 17 00:00:00 2001 From: Daniel Schulte Date: Tue, 3 Mar 2020 11:09:15 +0100 Subject: [PATCH] Add support for building with MinGW --- .../include/aws/core/utils/crypto/bcrypt/CryptoImpl.h | 7 +++++++ .../include/aws/core/utils/event/EventHeader.h | 10 ++++++++++ .../source/http/windows/WinHttpSyncHttpClient.cpp | 4 ++-- .../source/http/windows/WinINetSyncHttpClient.cpp | 2 +- .../source/http/windows/WinSyncHttpClient.cpp | 2 +- .../source/platform/windows/Environment.cpp | 5 +++++ .../source/platform/windows/FileSystem.cpp | 7 ++++++- .../source/platform/windows/OSVersionInfo.cpp | 2 ++ .../source/utils/crypto/factory/Factories.cpp | 4 ++-- .../BucketAndObjectOperationTest.cpp | 4 ++-- cmake/compiler_settings.cmake | 6 ++++++ .../source/platform/windows/PlatformTesting.cpp | 2 ++ 12 files changed, 46 insertions(+), 9 deletions(-) diff --git a/src/aws-cpp-sdk-core/include/aws/core/utils/crypto/bcrypt/CryptoImpl.h b/src/aws-cpp-sdk-core/include/aws/core/utils/crypto/bcrypt/CryptoImpl.h index 992efab47c..406380033a 100644 --- a/src/aws-cpp-sdk-core/include/aws/core/utils/crypto/bcrypt/CryptoImpl.h +++ b/src/aws-cpp-sdk-core/include/aws/core/utils/crypto/bcrypt/CryptoImpl.h @@ -29,7 +29,14 @@ namespace Aws { namespace Crypto { + #ifdef __MINGW32__ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wunused-variable" + #endif static const char* SecureRandom_BCrypt_Tag = "SecureRandom_BCrypt"; + #ifdef __MINGW32__ + #pragma GCC diagnostic pop + #endif class SecureRandomBytes_BCrypt : public SecureRandomBytes { diff --git a/src/aws-cpp-sdk-core/include/aws/core/utils/event/EventHeader.h b/src/aws-cpp-sdk-core/include/aws/core/utils/event/EventHeader.h index 2041b208da..6fb333bff7 100644 --- a/src/aws-cpp-sdk-core/include/aws/core/utils/event/EventHeader.h +++ b/src/aws-cpp-sdk-core/include/aws/core/utils/event/EventHeader.h @@ -14,6 +14,12 @@ #include #include +#ifdef __MINGW32__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic ignored "-Wuninitialized" +#endif + namespace Aws { namespace Utils @@ -318,3 +324,7 @@ namespace Aws } } } + +#ifdef __MINGW32__ +#pragma GCC diagnostic pop +#endif diff --git a/src/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp b/src/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp index 4a0f80a161..a98635f706 100644 --- a/src/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp +++ b/src/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp @@ -281,7 +281,7 @@ bool WinHttpSyncHttpClient::DoQueryHeaders(void* hHttpRequest, std::shared_ptr(dwSize / sizeof(wchar_t))); WinHttpQueryHeaders(hHttpRequest, WINHTTP_QUERY_CONTENT_TYPE, nullptr, &contentTypeStr, &dwSize, 0); - if (contentTypeStr[0] != NULL) + if (contentTypeStr[0]) { Aws::String contentStr = StringUtils::FromWString(contentTypeStr); response->SetContentType(contentStr); @@ -312,7 +312,7 @@ bool WinHttpSyncHttpClient::DoQueryHeaders(void* hHttpRequest, std::shared_ptrSetContentType(contentTypeStr); AWS_LOGSTREAM_DEBUG(GetLogTag(), "Received content type " << contentTypeStr); diff --git a/src/aws-cpp-sdk-core/source/platform/windows/Environment.cpp b/src/aws-cpp-sdk-core/source/platform/windows/Environment.cpp index fd8d58f291..097274a56b 100644 --- a/src/aws-cpp-sdk-core/source/platform/windows/Environment.cpp +++ b/src/aws-cpp-sdk-core/source/platform/windows/Environment.cpp @@ -19,6 +19,7 @@ that would need to be manually freed in all the client functions, just copy it i */ Aws::String GetEnv(const char *variableName) { +#ifdef _MSC_VER char* variableValue = nullptr; std::size_t valueSize = 0; auto queryResult = _dupenv_s(&variableValue, &valueSize, variableName); @@ -31,6 +32,10 @@ Aws::String GetEnv(const char *variableName) } return result; +#else // __MINGW32__ + auto variableValue = std::getenv(variableName); + return Aws::String( variableValue ? variableValue : "" ); +#endif } } // namespace Environment diff --git a/src/aws-cpp-sdk-core/source/platform/windows/FileSystem.cpp b/src/aws-cpp-sdk-core/source/platform/windows/FileSystem.cpp index 49af3c1f79..f427fa9233 100644 --- a/src/aws-cpp-sdk-core/source/platform/windows/FileSystem.cpp +++ b/src/aws-cpp-sdk-core/source/platform/windows/FileSystem.cpp @@ -11,7 +11,9 @@ #include #include -#pragma warning( disable : 4996) +#ifdef _MSC_VER +# pragma warning( disable : 4996) +#endif using namespace Aws::Utils; namespace Aws @@ -304,6 +306,9 @@ Aws::String CreateTempFilePath() { #ifdef _MSC_VER #pragma warning(disable: 4996) // _CRT_SECURE_NO_WARNINGS +#elif !defined(L_tmpnam_s) + // Definition from the MSVC stdio.h + #define L_tmpnam_s (sizeof("\\") + 16) #endif char s_tempName[L_tmpnam_s+1]; diff --git a/src/aws-cpp-sdk-core/source/platform/windows/OSVersionInfo.cpp b/src/aws-cpp-sdk-core/source/platform/windows/OSVersionInfo.cpp index 23f395f6bb..18bd5836da 100644 --- a/src/aws-cpp-sdk-core/source/platform/windows/OSVersionInfo.cpp +++ b/src/aws-cpp-sdk-core/source/platform/windows/OSVersionInfo.cpp @@ -9,7 +9,9 @@ #include +#ifdef _MSC_VER #pragma warning(disable: 4996) +#endif #include #include namespace Aws diff --git a/src/aws-cpp-sdk-core/source/utils/crypto/factory/Factories.cpp b/src/aws-cpp-sdk-core/source/utils/crypto/factory/Factories.cpp index d7cb481d5c..3b34d7fc62 100644 --- a/src/aws-cpp-sdk-core/source/utils/crypto/factory/Factories.cpp +++ b/src/aws-cpp-sdk-core/source/utils/crypto/factory/Factories.cpp @@ -939,7 +939,7 @@ std::shared_ptr Aws::Utils::Crypto::CreateSha256HMACIm return s_Sha256HMACFactory->CreateImplementation(); } -#ifdef _WIN32 +#ifdef _MSC_VER #pragma warning( push ) #pragma warning( disable : 4702 ) #endif @@ -1032,7 +1032,7 @@ std::shared_ptr Aws::Utils::Crypto::CreateAES_KeyWrapImplementa return s_AES_KeyWrapFactory->CreateImplementation(key); } -#ifdef _WIN32 +#ifdef _MSC_VER #pragma warning(pop) #endif diff --git a/tests/aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp b/tests/aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp index 0f31fcd061..586303e044 100644 --- a/tests/aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp +++ b/tests/aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp @@ -49,8 +49,9 @@ #include #include -#ifdef _WIN32 +#ifdef _MSC_VER #pragma warning(disable: 4127) +#endif #ifdef GetObject #undef GetObject #endif diff --git a/cmake/compiler_settings.cmake b/cmake/compiler_settings.cmake index db054b2c1b..e1d6dce55e 100644 --- a/cmake/compiler_settings.cmake +++ b/cmake/compiler_settings.cmake @@ -11,6 +11,9 @@ else() set(COMPILER_CLANG 1) else() set(COMPILER_GCC 1) + if(MINGW) + set(COMPILER_MINGW 1) + endif() endif() set(USE_GCC_FLAGS 1) endif() @@ -34,6 +37,9 @@ endfunction() macro(set_gcc_flags) list(APPEND AWS_COMPILER_FLAGS "-fno-exceptions" "-std=c++${CPP_STANDARD}") + if(COMPILER_IS_MINGW) + list(APPEND AWS_COMPILER_FLAGS -D__USE_MINGW_ANSI_STDIO=1) + endif() if(NOT BUILD_SHARED_LIBS) list(APPEND AWS_COMPILER_FLAGS "-fPIC") diff --git a/tests/testing-resources/source/platform/windows/PlatformTesting.cpp b/tests/testing-resources/source/platform/windows/PlatformTesting.cpp index 2b0a04c0b4..2a27710557 100644 --- a/tests/testing-resources/source/platform/windows/PlatformTesting.cpp +++ b/tests/testing-resources/source/platform/windows/PlatformTesting.cpp @@ -5,7 +5,9 @@ #include +#ifdef _MSC_VER #pragma warning(disable: 4996) +#endif #include #include