Skip to content

Reapply endianess fix in CFInternal.h that got overwrote by import fr… #935

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
Apr 10, 2017

Conversation

vivkong
Copy link
Contributor

@vivkong vivkong commented Apr 6, 2017

…om Sierra

The import from Sierra back in December overwrote a fix in CFInternal.h (#386) which is breaking s390x.

This is the same as #934 but for the master branch.

Thanks.

@pushkarnk
Copy link
Member

@vivkong Is this possibly a duplicate of #934 ? Though the commits seem to be distinct, the patches look identical.

@vivkong
Copy link
Contributor Author

vivkong commented Apr 7, 2017

@pushkarnk Yes it's the same as #934. #934 is for the swift-3.1-branch while this PR is for master branch.

@pushkarnk
Copy link
Member

@vivkong Oh, sorry, may bad!

@parkera
Copy link
Contributor

parkera commented Apr 10, 2017

@swift-ci test and merge

@swift-ci swift-ci merged commit f79b6e0 into swiftlang:master Apr 10, 2017
@vivkong vivkong deleted the swift-fix branch March 8, 2018 13:44
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.

4 participants