Basic: Adjust condition for include after macro removal in upstream LLVM #81819
+2
−2
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
bnbarham
approved these changes
May 28, 2025
|
@swift-ci please smoke test |
etcwilde
approved these changes
May 28, 2025
etcwilde
reviewed
May 28, 2025
`HAVE_SYS_RESOURCE_H` was removed in llvm/llvm-project#123288, so this header is no longer included at this particular location on rebranch, which breaks the Linux build, where it is not transitively included either. Use the same condition as in the use site (`getChildrenMaxResidentSetSize`) instead. Also, don't wrap `HAVE_GETRUSAGE` in `defined()` in case it does get defined to 0.
|
@swift-ci please smoke test |
|
@swift-ci please smoke test Linux |
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.
HAVE_SYS_RESOURCE_Hwas removed in llvm/llvm-project#123288, so this header is no longer included at this particular location on rebranch, which breaks the Linux build, where it is not transitively included either.Use the same condition as in the use site (
getChildrenMaxResidentSetSize) instead.Also, don't wrap
HAVE_GETRUSAGEindefined()in case it does get defined to 0.