Skip to content

Revert "Import CoreFoundation sources from High Sierra" #1328

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Nov 18, 2017
Merged

Revert "Import CoreFoundation sources from High Sierra" #1328

merged 1 commit into from
Nov 18, 2017

Conversation

@slavapestov
Copy link
Contributor

@slavapestov slavapestov commented Nov 18, 2017

Reverts #1305

This broke the build: https://ci.swift.org/job/oss-swift-package-linux-ubuntu-14_04/705/consoleFull#-13718315243122a513-f36a-4c87-8ed7-cbc36a1ec144

CoreFoundation/Locale.subproj/CFLocale.c:1504:37: error: use of undeclared identifier 'UMS_UK'; did you mean 'UMS_US'?
            *outMeasurementSystem = UMS_UK;
                                    ^~~~~~
                                    UMS_US

@slavapestov
Copy link
Contributor Author

slavapestov commented Nov 18, 2017

@swift-ci Please test

@slavapestov slavapestov requested a review from parkera November 18, 2017 17:40
@slavapestov slavapestov merged commit e48175b into master Nov 18, 2017
@alblue alblue mentioned this pull request Nov 28, 2017
Closed
@parkera parkera deleted the revert-1305-cf_import branch July 30, 2024 22:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@parkera parkera Awaiting requested review from parkera

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@slavapestov