Skip to content

Commit 78ff757

Browse files
chore(server): vcpkg 2026.04.27 (#1020)
* chore(server): vcpkg 2026.04.27 * chore(ci): detect package.json changes * fix(server): guard AWS Outcome.h against Windows ERROR macro vcpkg 2026.04.27's aws-sdk-cpp adds `typedef E ERROR;` in Outcome.h, which collides with the GDI `ERROR` macro pulled in via `atlbase.h`. Push/undef/pop `ERROR` around the AWS includes in `engLib/headers.h`. --------- Co-authored-by: Alexandru Sclearuc <asclearuc@gmail.com>
1 parent e033856 commit 78ff757

3 files changed

Lines changed: 10 additions & 1 deletion

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ jobs:
5959
- 'builder'
6060
- 'builder.cmd'
6161
- '.github/workflows/**'
62+
- 'package.json'
6263
6364
# ---------------------------------------------------------------------------
6465
# Helm lint + schema validation (only on PRs touching deploy/helm/**)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"private": true,
66
"license": "MIT",
77
"vcpkg": {
8-
"version": "2026.02.27"
8+
"version": "2026.04.27"
99
},
1010
"java": {
1111
"jdkVersion": "17",

packages/server/engine-lib/engLib/headers.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,20 @@
7777
// https://github.com/aws/aws-sdk-cpp/pull/1189
7878
#pragma push_macro("JSON_USE_EXCEPTION")
7979
#undef JSON_USE_EXCEPTION
80+
// atlbase.h (included above) pulls in wingdi.h, which defines the ERROR macro
81+
// (#define ERROR 0). The newer aws-sdk-cpp declares `typedef E ERROR;` in
82+
// aws/core/utils/Outcome.h, so the macro expands it to `typedef E 0;` and the
83+
// header fails to compile. Suppress the GDI macro across the AWS includes and
84+
// restore it afterwards so Windows code below is unaffected.
85+
#pragma push_macro("ERROR")
86+
#undef ERROR
8087
#include <aws/core/Aws.h>
8188
#include <aws/core/auth/AWSCredentialsProvider.h>
8289
#include <aws/core/http/Scheme.h>
8390
#include <aws/core/utils/memory/stl/AWSSet.h>
8491
#include <aws/core/utils/logging/DefaultLogSystem.h>
8592
#include <aws/core/utils/logging/AWSLogging.h>
93+
#pragma pop_macro("ERROR")
8694
#pragma pop_macro("JSON_USE_EXCEPTION")
8795

8896
#if ROCKETRIDE_PLAT_WIN

0 commit comments

Comments
 (0)