Skip to content

[CF] Go from three sets of OS* decls to two. #2600

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
Jan 10, 2020

Conversation

3405691582
Copy link
Member

In Prefix, declarations for the OSAtomic* family of functions and
OSMemoryBarrier are duplicated for Linux, BSD, and Windows. In this
commit, the declarations for OS* functions are made common, since they
are apparently identical for both targets.

Unifying the declarations for Windows is a separate task, since those
declarations use CF_EXPORT. There might be a nice way to go to just a
single set of OS* declarations, but that can come later. This way,
this commit is just a structural change rather than a structural and
functional one.

In Prefix, declarations for the OSAtomic* family of functions and
OSMemoryBarrier are duplicated for Linux, BSD, and Windows. In this
commit, the declarations for OS* functions are made common, since they
are apparently identical for both targets.

Unifying the declarations for Windows is a separate task, since those
declarations use CF_EXPORT. There might be a nice way to go to just a
single set of OS* declarations, but that can come later.  This way,
this commit is just a structural change rather than a structural and
functional one.
@3405691582 3405691582 force-pushed the Prefix_CommonOSDecls branch from 4653bc6 to 8cc10c8 Compare January 9, 2020 00:00
@compnerd
Copy link
Member

compnerd commented Jan 9, 2020

Thanks for the cleanup!

@compnerd
Copy link
Member

compnerd commented Jan 9, 2020

@swift-ci please test

@compnerd compnerd merged commit f6f7257 into swiftlang:master Jan 10, 2020
@3405691582 3405691582 deleted the Prefix_CommonOSDecls branch January 11, 2020 18:00
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