MSVC Compatibility Macros#35
Open
vijayee wants to merge 2 commits into
Open
Conversation
Upstream commit 5a4ba02 dropped the generator expression that restricted -Wall -Werror to GCC. MSVC's cl.exe rejects -Werror as an invalid numeric argument (D8021), so any project that pulls hashmap in via add_subdirectory on Windows fails to configure. Restore the generator expression and extend it to Clang and AppleClang, matching the intent of the original line.
MSVC's C compiler rejects several constructs that hashmap.h relies on:
- typeof() is a GCC extension
- statement expressions ({ ... }) are GCC-only
- C99 compound literals (Type){ ... } are not in MSVC's C
- zero-size struct arrays are illegal
The hashmap header template uses each of these for type-safe iteration
and the HASHMAP() macro. Provide MSVC-compatible variants behind
__HASHMAP_MSVC, gated on _MSC_VER. The public API (macro names, struct
field layout) is unchanged.
src/hashmap.c: hashmap_calc_table_size() calls __builtin_clzl, which
does not exist on MSVC. Provide a local _BitScanReverse-backed shim
under the same _MSC_VER guard.
Together these let liboffs (and any other project that consumes the
vijayee/hashmap fork) build cleanly with MSVC.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This adds portability and usability to the MSVC compiler