Skip to content

Initialize TSD on macOS even without Swift runtime #1695

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 14, 2018
Merged

Initialize TSD on macOS even without Swift runtime #1695

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/CFRuntime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,7 @@ extern void __CFNumberInitialize(void);
extern void __CFCharacterSetInitialize(void);
extern void __CFPFactoryInitialize(void);
extern void __CFPlugInInitialize(void);
#if DEPLOYMENT_TARGET_LINUX || (DEPLOYMENT_TARGET_MACOSX && DEPLOYMENT_RUNTIME_SWIFT)
#if DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_MACOSX
CF_PRIVATE void __CFTSDInitialize(void);
#endif
#if DEPLOYMENT_TARGET_WINDOWS
Expand Down Expand Up @@ -1076,7 +1076,7 @@ void __CFInitialize(void) {
#if DEPLOYMENT_TARGET_WINDOWS
// Must not call any CF functions
__CFTSDWindowsInitialize();
#elif DEPLOYMENT_TARGET_LINUX || (DEPLOYMENT_TARGET_MACOSX && DEPLOYMENT_RUNTIME_SWIFT)
#elif DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_MACOSX
__CFTSDInitialize();
#endif
__CFProphylacticAutofsAccess = true;
Expand Down