Issue 14151: Fix conflicting defines on Windows hidden by cmake unity builds #14154
Conversation
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
… Win32 macros are always undefined. Copy deletion of ICU undefine of __STRICT_ANSI__ from ICU upstream that conflicts with GCC-14 header files
|
Thanks so much for looking into this, maybe @hawkfish can double-check the ICU changes? |
hawkfish
approved these changes
Sep 30, 2024
|
Thanks! |
github-actions bot
pushed a commit
to duckdb/duckdb-r
that referenced
this pull request
Oct 16, 2024
Issue 14151: Fix conflicting defines on Windows hidden by cmake unity builds (duckdb/duckdb#14154)
github-actions bot
added a commit
to duckdb/duckdb-r
that referenced
this pull request
Oct 16, 2024
Issue 14151: Fix conflicting defines on Windows hidden by cmake unity builds (duckdb/duckdb#14154) Co-authored-by: krlmlr <krlmlr@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
These two changes fix builds that don't use cmake unity described in issue #14151
Remove header inclusion guard in windows_undefs.hpp to insure certain Win32 macros are always undefined - this is okay because all these #undef are guarded by
#ifdef WIN32Copy deletion of ICU undefine of
__STRICT_ANSI__from ICU upstream that conflicts with GCC-14 header files - this duplicates ICU-22721 Delete obsolete __STRICT_ANSI__ workaround for MinGW unicode-org/icu#3003 - it would be better to pull the latest ICU in but ICU is used in a customized way that would require more effort - also looks like fix won't be released till ICU 75.2 which is not yet released - https://unicode-org.atlassian.net/browse/ICU-22721