Add support for building with MinGW

Daniel Schulte · Daniel Schulte · commit e54eb2758258 · 2020-03-03T11:20:32.000+01:00
diff --git a/aws-cpp-sdk-core/include/aws/core/utils/Array.h b/aws-cpp-sdk-core/include/aws/core/utils/Array.h
@@ -64,7 +64,7 @@ namespace Aws
                 {
                     m_data.reset(Aws::NewArray<T>(m_size, ARRAY_ALLOCATION_TAG));
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
                     std::copy(arrayToCopy, arrayToCopy + arraySize, stdext::checked_array_iterator< T * >(m_data.get(), m_size));
 #else
                     std::copy(arrayToCopy, arrayToCopy + arraySize, m_data.get());
@@ -92,7 +92,7 @@ namespace Aws
                     if(arr->m_size > 0 && arr->m_data)
                     {
                         size_t arraySize = arr->m_size;
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
                         std::copy(arr->m_data.get(), arr->m_data.get() + arraySize, stdext::checked_array_iterator< T * >(m_data.get() + location, m_size));
 #else
                         std::copy(arr->m_data.get(), arr->m_data.get() + arraySize, m_data.get() + location);
@@ -111,7 +111,7 @@ namespace Aws
                 {
                     m_data.reset(Aws::NewArray<T>(m_size, ARRAY_ALLOCATION_TAG));
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
                     std::copy(other.m_data.get(), other.m_data.get() + other.m_size, stdext::checked_array_iterator< T * >(m_data.get(), m_size));
 #else
                     std::copy(other.m_data.get(), other.m_data.get() + other.m_size, m_data.get());
@@ -144,7 +144,7 @@ namespace Aws
                 {
                     m_data.reset(Aws::NewArray<T>(m_size, ARRAY_ALLOCATION_TAG));
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
                     std::copy(other.m_data.get(), other.m_data.get() + other.m_size, stdext::checked_array_iterator< T * >(m_data.get(), m_size));
 #else
                     std::copy(other.m_data.get(), other.m_data.get() + other.m_size, m_data.get());
diff --git a/aws-cpp-sdk-core/include/aws/core/utils/crypto/bcrypt/CryptoImpl.h b/aws-cpp-sdk-core/include/aws/core/utils/crypto/bcrypt/CryptoImpl.h
@@ -39,7 +39,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/aws-cpp-sdk-core/include/aws/core/utils/event/EventHeader.h b/aws-cpp-sdk-core/include/aws/core/utils/event/EventHeader.h
@@ -24,6 +24,12 @@
 #include <aws/event-stream/event_stream.h>
 #include <cassert>
 
+#ifdef __MINGW32__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#pragma GCC diagnostic ignored "-Wuninitialized"
+#endif
+
 namespace Aws
 {
     namespace Utils
@@ -319,3 +325,7 @@ namespace Aws
         }
     }
 }
+
+#ifdef __MINGW32__
+#pragma GCC diagnostic pop
+#endif
diff --git a/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp b/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp
@@ -267,7 +267,7 @@ bool WinHttpSyncHttpClient::DoQueryHeaders(void* hHttpRequest, std::shared_ptr<H
     wmemset(contentTypeStr, 0, static_cast<size_t>(dwSize / sizeof(wchar_t)));
     
     WinHttpQueryHeaders(hHttpRequest, WINHTTP_QUERY_CONTENT_TYPE, nullptr, &contentTypeStr, &dwSize, 0);
-    if (contentTypeStr[0] != NULL)
+    if (contentTypeStr[0] != 0)
     {
         Aws::String contentStr = StringUtils::FromWString(contentTypeStr);
         response->SetContentType(contentStr);
@@ -298,7 +298,7 @@ bool WinHttpSyncHttpClient::DoQueryHeaders(void* hHttpRequest, std::shared_ptr<H
 
 bool WinHttpSyncHttpClient::DoSendRequest(void* hHttpRequest) const
 {
-    return (WinHttpSendRequest(hHttpRequest, NULL, NULL, 0, 0, 0, NULL) != 0);
+    return (WinHttpSendRequest(hHttpRequest, NULL, 0, 0, 0, 0, 0) != 0);
 }
 
 bool WinHttpSyncHttpClient::DoReadData(void* hHttpRequest, char* body, uint64_t size, uint64_t& read) const
diff --git a/aws-cpp-sdk-core/source/http/windows/WinINetSyncHttpClient.cpp b/aws-cpp-sdk-core/source/http/windows/WinINetSyncHttpClient.cpp
@@ -228,7 +228,7 @@ bool WinINetSyncHttpClient::DoQueryHeaders(void* hHttpRequest, std::shared_ptr<H
     char contentTypeStr[1024];
     dwSize = sizeof(contentTypeStr);
     HttpQueryInfoA(hHttpRequest, HTTP_QUERY_CONTENT_TYPE, &contentTypeStr, &dwSize, 0);
-    if (contentTypeStr[0] != NULL)
+    if (contentTypeStr[0] != 0)
     {
         response->SetContentType(contentTypeStr);
         AWS_LOGSTREAM_DEBUG(GetLogTag(), "Received content type " << contentTypeStr);
diff --git a/aws-cpp-sdk-core/source/http/windows/WinSyncHttpClient.cpp b/aws-cpp-sdk-core/source/http/windows/WinSyncHttpClient.cpp
@@ -322,7 +322,7 @@ void WinSyncHttpClient::MakeRequestInternal(HttpRequest& request,
         }
     }
 
-    if (!success && !IsRequestProcessingEnabled() || !ContinueRequest(request))
+    if (!success && (!IsRequestProcessingEnabled() || !ContinueRequest(request)))
     {
         response->SetClientErrorType(CoreErrors::USER_CANCELLED);
         response->SetClientErrorMessage("Request processing disabled or continuation cancelled by user's continuation handler.");
diff --git a/aws-cpp-sdk-core/source/platform/windows/Environment.cpp b/aws-cpp-sdk-core/source/platform/windows/Environment.cpp
@@ -29,6 +29,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);
@@ -41,6 +42,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/aws-cpp-sdk-core/source/platform/windows/FileSystem.cpp b/aws-cpp-sdk-core/source/platform/windows/FileSystem.cpp
@@ -21,7 +21,9 @@
 #include <iostream>
 #include <Userenv.h>
 
-#pragma warning( disable : 4996)
+#ifdef _MSC_VER
+#    pragma warning( disable : 4996)
+#endif
 
 using namespace Aws::Utils;
 namespace Aws
@@ -314,6 +316,9 @@ Aws::String CreateTempFilePath()
 {
 #ifdef _MSC_VER
 #pragma warning(disable: 4996) // _CRT_SECURE_NO_WARNINGS
+#else
+    // Definition from the MSVC stdio.h
+    #define L_tmpnam_s (sizeof("\\") + 16)
 #endif
     char s_tempName[L_tmpnam_s+1];
 
diff --git a/aws-cpp-sdk-core/source/platform/windows/OSVersionInfo.cpp b/aws-cpp-sdk-core/source/platform/windows/OSVersionInfo.cpp
@@ -19,7 +19,9 @@
 
 #include <iomanip>
 
+#ifdef _MSC_VER
 #pragma warning(disable: 4996)
+#endif
 #include <windows.h>
 #include <stdio.h>
 namespace Aws
diff --git a/aws-cpp-sdk-core/source/utils/crypto/factory/Factories.cpp b/aws-cpp-sdk-core/source/utils/crypto/factory/Factories.cpp
@@ -755,7 +755,7 @@ std::shared_ptr<Aws::Utils::Crypto::HMAC> Aws::Utils::Crypto::CreateSha256HMACIm
     return s_Sha256HMACFactory->CreateImplementation();
 }
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #pragma warning( push )
 #pragma warning( disable : 4702 )
 #endif
@@ -840,7 +840,7 @@ std::shared_ptr<SymmetricCipher> Aws::Utils::Crypto::CreateAES_KeyWrapImplementa
     return s_AES_KeyWrapFactory->CreateImplementation(key);
 }
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 
diff --git a/aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp b/aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp
@@ -54,9 +54,9 @@
 #include <aws/testing/TestingEnvironment.h>
 #include <fstream>
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #pragma warning(disable: 4127)
-#endif //_WIN32
+#endif //_MSC_VER
 
 #include <aws/core/http/standard/StandardHttpRequest.h>
 
diff --git 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(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES MATCHES "mingw32")
+            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/testing-resources/source/platform/windows/PlatformTesting.cpp b/testing-resources/source/platform/windows/PlatformTesting.cpp
@@ -15,7 +15,9 @@
 
 #include <aws/testing/platform/PlatformTesting.h>
 
+#ifdef _MSC_VER
 #pragma warning(disable: 4996)
+#endif
 #include <windows.h>
 #include <aws/core/utils/memory/stl/AWSStringStream.h>
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,14 @@ namespace Aws`
`39`	`39`	`{`
`40`	`40`	`namespace Crypto`
`41`	`41`	`{`
	`42`	`+ #ifdef __MINGW32__`
	`43`	`+ #pragma GCC diagnostic push`
	`44`	`+ #pragma GCC diagnostic ignored "-Wunused-variable"`
	`45`	`+ #endif`
`42`	`46`	`static const char* SecureRandom_BCrypt_Tag = "SecureRandom_BCrypt";`
	`47`	`+ #ifdef __MINGW32__`
	`48`	`+ #pragma GCC diagnostic pop`
	`49`	`+ #endif`
`43`	`50`
`44`	`51`	`class SecureRandomBytes_BCrypt : public SecureRandomBytes`
`45`	`52`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,12 @@`
`24`	`24`	`#include <aws/event-stream/event_stream.h>`
`25`	`25`	`#include <cassert>`
`26`	`26`
	`27`	`+#ifdef __MINGW32__`
	`28`	`+#pragma GCC diagnostic push`
	`29`	`+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"`
	`30`	`+#pragma GCC diagnostic ignored "-Wuninitialized"`
	`31`	`+#endif`
	`32`	`+`
`27`	`33`	`namespace Aws`
`28`	`34`	`{`
`29`	`35`	`namespace Utils`
`@@ -319,3 +325,7 @@ namespace Aws`
`319`	`325`	`}`
`320`	`326`	`}`
`321`	`327`	`}`
	`328`	`+`
	`329`	`+#ifdef __MINGW32__`
	`330`	`+#pragma GCC diagnostic pop`
	`331`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ bool WinHttpSyncHttpClient::DoQueryHeaders(void* hHttpRequest, std::shared_ptr<H`
`267`	`267`	`wmemset(contentTypeStr, 0, static_cast<size_t>(dwSize / sizeof(wchar_t)));`
`268`	`268`
`269`	`269`	`WinHttpQueryHeaders(hHttpRequest, WINHTTP_QUERY_CONTENT_TYPE, nullptr, &contentTypeStr, &dwSize, 0);`
`270`		`- if (contentTypeStr[0] != NULL)`
	`270`	`+ if (contentTypeStr[0] != 0)`
`271`	`271`	`{`
`272`	`272`	`Aws::String contentStr = StringUtils::FromWString(contentTypeStr);`
`273`	`273`	`response->SetContentType(contentStr);`
`@@ -298,7 +298,7 @@ bool WinHttpSyncHttpClient::DoQueryHeaders(void* hHttpRequest, std::shared_ptr<H`
`298`	`298`
`299`	`299`	`bool WinHttpSyncHttpClient::DoSendRequest(void* hHttpRequest) const`
`300`	`300`	`{`
`301`		`- return (WinHttpSendRequest(hHttpRequest, NULL, NULL, 0, 0, 0, NULL) != 0);`
	`301`	`+ return (WinHttpSendRequest(hHttpRequest, NULL, 0, 0, 0, 0, 0) != 0);`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`bool WinHttpSyncHttpClient::DoReadData(void* hHttpRequest, char* body, uint64_t size, uint64_t& read) const`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ bool WinINetSyncHttpClient::DoQueryHeaders(void* hHttpRequest, std::shared_ptr<H`
`228`	`228`	`char contentTypeStr[1024];`
`229`	`229`	`dwSize = sizeof(contentTypeStr);`
`230`	`230`	`HttpQueryInfoA(hHttpRequest, HTTP_QUERY_CONTENT_TYPE, &contentTypeStr, &dwSize, 0);`
`231`		`- if (contentTypeStr[0] != NULL)`
	`231`	`+ if (contentTypeStr[0] != 0)`
`232`	`232`	`{`
`233`	`233`	`response->SetContentType(contentTypeStr);`
`234`	`234`	`AWS_LOGSTREAM_DEBUG(GetLogTag(), "Received content type " << contentTypeStr);`
Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ void WinSyncHttpClient::MakeRequestInternal(HttpRequest& request,`
`322`	`322`	`}`
`323`	`323`	`}`
`324`	`324`
`325`		`- if (!success && !IsRequestProcessingEnabled() \|\| !ContinueRequest(request))`
	`325`	`+ if (!success && (!IsRequestProcessingEnabled() \|\| !ContinueRequest(request)))`
`326`	`326`	`{`
`327`	`327`	`response->SetClientErrorType(CoreErrors::USER_CANCELLED);`
`328`	`328`	`response->SetClientErrorMessage("Request processing disabled or continuation cancelled by user's continuation handler.");`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ that would need to be manually freed in all the client functions, just copy it i`
`29`	`29`	`*/`
`30`	`30`	`Aws::String GetEnv(const char *variableName)`
`31`	`31`	`{`
	`32`	`+#ifdef _MSC_VER`
`32`	`33`	`char* variableValue = nullptr;`
`33`	`34`	`std::size_t valueSize = 0;`
`34`	`35`	`auto queryResult = _dupenv_s(&variableValue, &valueSize, variableName);`
`@@ -41,6 +42,10 @@ Aws::String GetEnv(const char *variableName)`
`41`	`42`	`}`
`42`	`43`
`43`	`44`	`return result;`
	`45`	`+#else // __MINGW32__`
	`46`	`+ auto variableValue = std::getenv(variableName);`
	`47`	`+ return Aws::String( variableValue ? variableValue : "" );`
	`48`	`+#endif`
`44`	`49`	`}`
`45`	`50`
`46`	`51`	`} // namespace Environment`
Original file line number	Diff line number	Diff line change
`@@ -755,7 +755,7 @@ std::shared_ptr<Aws::Utils::Crypto::HMAC> Aws::Utils::Crypto::CreateSha256HMACIm`
`755`	`755`	`return s_Sha256HMACFactory->CreateImplementation();`
`756`	`756`	`}`
`757`	`757`
`758`		`-#ifdef _WIN32`
	`758`	`+#ifdef _MSC_VER`
`759`	`759`	`#pragma warning( push )`
`760`	`760`	`#pragma warning( disable : 4702 )`
`761`	`761`	`#endif`
`@@ -840,7 +840,7 @@ std::shared_ptr<SymmetricCipher> Aws::Utils::Crypto::CreateAES_KeyWrapImplementa`
`840`	`840`	`return s_AES_KeyWrapFactory->CreateImplementation(key);`
`841`	`841`	`}`
`842`	`842`
`843`		`-#ifdef _WIN32`
	`843`	`+#ifdef _MSC_VER`
`844`	`844`	`#pragma warning(pop)`
`845`	`845`	`#endif`
`846`	`846`