Skip to content

Collapse #if branches for macOS/Linux/BSD #2768

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
Apr 18, 2020
Merged

Collapse #if branches for macOS/Linux/BSD #2768

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: 1 addition & 3 deletions CoreFoundation/StringEncodings.subproj/CFUniChar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,7 @@ CF_INLINE void __CFUniCharCharacterSetPath(wchar_t *wpath) {
#else
#error Unknown or unspecified DEPLOYMENT_TARGET
#endif
#if TARGET_OS_MAC
strlcpy(cpath, __kCFCharacterSetDir, MAXPATHLEN);
#elif TARGET_OS_LINUX || TARGET_OS_BSD
#if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD
strlcpy(cpath, __kCFCharacterSetDir, MAXPATHLEN);
#elif TARGET_OS_WIN32
wchar_t frameworkPath[MAXPATHLEN];
Expand Down