Fix naming conflict with illumos's regset.h. #44
Merged
+7
−7
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
Illumos defines a `DS` macro in its regset.h: https://github.com/illumos/illumos-gate/blob/master/usr/src/uts/intel/sys/regset.h#L111 This conflicts with the DS template parameters used in structs in boost/geometry/strategies/line_interpolate. This patch renames the conflicting DS parameters to avoid the conflict.
Contributor
Author
|
Note: we could also resolve this by undef-ing the conflicting macros on illumos. I'm happy to revise if you prefer that approach. |
alexey-milovidov
approved these changes
Jan 5, 2026
Member
|
@jmcarp Please also upstream this patch to Boost so we (ClickHouse) don't need to maintain it long-term. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Illumos defines a
DSmacro in its regset.h:https://github.com/illumos/illumos-gate/blob/master/usr/src/uts/intel/sys/regset.h#L111
This conflicts with the DS template parameters used in structs in boost/geometry/strategies/line_interpolate. This patch renames the conflicting DS parameters to avoid the conflict.