Skip to content

Commit

Permalink
handle windows enum conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
jmklix committed Sep 26, 2024
1 parent 4fcbb39 commit 50958a4
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion src/aws-cpp-sdk-core/include/aws/core/http/Version.h
Original file line number Diff line number Diff line change
@@ -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.
*/

Expand All @@ -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,
Expand Down

0 comments on commit 50958a4

Please sign in to comment.