Skip to content

[lldb] Avoid conflict between mach/machine.h and llvm/BinaryFormat/Ma… #4919

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.

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

Merged
merged 1 commit into from
Jul 1, 2022

Conversation

JDevlieghere
Copy link

…chO.h

Certain SDKs transitively include mach/machine.h which defines constants
that conflict with llvm/BinaryFormat/MachO.h. By ordering the includes
we can avoid the conflict.

rdar://96148553

…chO.h

Certain SDKs transitively include mach/machine.h which defines constants
that conflict with llvm/BinaryFormat/MachO.h. By ordering the includes
we can avoid the conflict.

rdar://96148553
@JDevlieghere JDevlieghere requested a review from augusto2112 June 30, 2022 23:31
@JDevlieghere
Copy link
Author

@swift-ci please test

@JDevlieghere
Copy link
Author

@swift-ci please test macos

@JDevlieghere JDevlieghere merged commit 727c105 into stable/20211026 Jul 1, 2022
@JDevlieghere JDevlieghere deleted the jdevlieghere/rdar/96148553 branch July 1, 2022 05:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants