Skip to content

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

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 11, 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.

I'll create another PR for master.

@@ -341,18 +341,24 @@ CF_EXPORT void * __CFConstantStringClassReferencePtr;

CF_EXPORT void *__CFConstantStringClassReference[];

#if __CF_BIG_ENDIAN__
#define CFINFO {0x00, 0x00, 0x07, 0xc8}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we actually give this a better name, like CF_CONST_STRING_INFO?

Copy link
Contributor Author

@vivkong vivkong Apr 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. I've changed the name.

@vivkong
Copy link
Contributor Author

vivkong commented Apr 11, 2017

@parkera, can you please merge this PR too for swift_3.1_branch? Thanks.

@parkera parkera merged commit d551643 into swiftlang:swift-3.1-branch Apr 11, 2017
@vivkong vivkong deleted the swift31-fix branch April 11, 2017 17:32
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