Skip to content

fix(seekdb): Fix Windows SDK OPTIONAL macro naming conflict with C++ enum value #917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ep-12221 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix(seekdb): Fix Windows SDK OPTIONAL macro naming conflict with C++ enum value #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d89daca
Root cause: The Windows SDK's winnt.h defines OPTIONAL as an empty ma…
ep-12221 Jun 18, 2026
d60fa22
fix ai code
ep-12221 Jun 18, 2026
491d7b3
fix space
ep-12221 Jun 18, 2026
940042d
fix(build): remove dangling zstd/zstd_objs.lib link reference on Windows
ep-12221 Jun 18, 2026
15b926b
remove unused dependence
ep-12221 Jun 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions deps/oblib/src/rpc/frame/ob_req_packet_code.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ enum ObReqPacketCode : int32_t
// obcall transport header so the config path keeps compiling. The accessor names
// keep the rpc_checksum wording because they mirror the _rpc_checksum config.
// ---------------------------------------------------------------------------
// `OPTIONAL` is an (empty) macro in the Windows SDK (winnt.h). Undefine it so
// the enumerator below is not eaten by the preprocessor on MSVC/clang-cl.
#ifdef OPTIONAL
#undef OPTIONAL
#endif
enum class ObReqCheckSumCheckLevel
{
INVALID,
Expand Down
4 changes: 1 addition & 3 deletions src/observer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,9 +521,7 @@ if(WIN32)
endif()
# oblib_add_extra_objects creates separate .lib files not merged into oblib.lib on Windows
target_link_libraries(observer_without_bolt PRIVATE
${CMAKE_BINARY_DIR}/deps/oblib/src/lib/compress/zstd_1_3_8/zstd_1_3_8_objs.lib
${CMAKE_BINARY_DIR}/deps/oblib/src/lib/compress/zstd/zstd_objs.lib
${CMAKE_BINARY_DIR}/deps/oblib/src/lib/compress/lz4/lz4-all.lib)
${CMAKE_BINARY_DIR}/deps/oblib/src/lib/compress/zstd_1_3_8/zstd_1_3_8_objs.lib)
# Itanium ABI _Unwind_* stubs (Windows uses SEH; PL unwinding non-functional)
target_sources(observer_without_bolt PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/win32_unwind_stubs.c)
endif()
Expand Down
Loading