From 50958a4a21335b809d1b391e4b7037fcc13d5a0d Mon Sep 17 00:00:00 2001 From: Joseph Klix Date: Thu, 26 Sep 2024 14:51:04 -0700 Subject: [PATCH 1/2] handle windows enum conflict --- src/aws-cpp-sdk-core/include/aws/core/http/Version.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/aws-cpp-sdk-core/include/aws/core/http/Version.h b/src/aws-cpp-sdk-core/include/aws/core/http/Version.h index 921e0676008..1bebf2d5f38 100644 --- a/src/aws-cpp-sdk-core/include/aws/core/http/Version.h +++ b/src/aws-cpp-sdk-core/include/aws/core/http/Version.h @@ -1,5 +1,5 @@ /** - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0. */ @@ -10,6 +10,15 @@ namespace Aws { /** * Enum to represent version of the http protocol to use */ + +#ifdef _WIN32 +#pragma push_macro("WIN_HTTP_VERSION") +#undef HTTP_VERSION_1_0 +#undef HTTP_VERSION_1_1 +#undef HTTP_VERSION_2_0 + +#pragma pop_macro("WIN_HTTP_VERSION") +#endif //#ifdef _WIN32 enum class Version { HTTP_VERSION_NONE, HTTP_VERSION_1_0, From 8392f06c9741fd5a29566ebd7e1ec2a10060dccd Mon Sep 17 00:00:00 2001 From: Joseph Klix Date: Thu, 26 Sep 2024 14:56:37 -0700 Subject: [PATCH 2/2] fix spacing typo --- src/aws-cpp-sdk-core/include/aws/core/http/Version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/aws-cpp-sdk-core/include/aws/core/http/Version.h b/src/aws-cpp-sdk-core/include/aws/core/http/Version.h index 1bebf2d5f38..b89fd8f8fde 100644 --- a/src/aws-cpp-sdk-core/include/aws/core/http/Version.h +++ b/src/aws-cpp-sdk-core/include/aws/core/http/Version.h @@ -1,5 +1,5 @@ /** -* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0. */