Skip to content

Adapt for the mangling prefix change ($S -> $s) #1699

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

Merged
merged 1 commit into from
Sep 20, 2018
Merged

Adapt for the mangling prefix change ($S -> $s) #1699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CoreFoundation/Base.subproj/CFInternal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,9 +409,9 @@ CF_EXPORT void * __CFConstantStringClassReferencePtr;
#if DEPLOYMENT_RUNTIME_SWIFT

#if TARGET_OS_MAC
#define __CFConstantStringClassReference $S15SwiftFoundation19_NSCFConstantStringCN
#define __CFConstantStringClassReference $s15SwiftFoundation19_NSCFConstantStringCN
#else
#define __CFConstantStringClassReference $S10Foundation19_NSCFConstantStringCN
#define __CFConstantStringClassReference $s10Foundation19_NSCFConstantStringCN
#endif

CF_EXPORT void *__CFConstantStringClassReference[];
Expand Down
5 changes: 5 additions & 0 deletions CoreFoundation/Base.subproj/SymbolAliases
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,8 @@ _kCFNumberFormatterZeroSymbolKey _kCFNumberFormatterZeroSymbol
_kCFNumberFormatterUsesCharacterDirectionKey _kCFNumberFormatterUsesCharacterDirection
_kCFDateFormatterUsesCharacterDirectionKey _kCFDateFormatterUsesCharacterDirection
_kCFDateFormatterCalendarIdentifierKey _kCFDateFormatterCalendarName

# Workaround for being able to compile with a swift compiler with the old mangling prefix $S.
# This can eventually be removed if everyone compiles with the ABI-stable Swift 5.0 compiler.
_$S15SwiftFoundation19_NSCFConstantStringCN _$s15SwiftFoundation19_NSCFConstantStringCN