Skip to content

Delete _os_log_set_nscf_formatter related lines to make the framework run on macOS 10.11 #784

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 2 commits into from
Jan 11, 2017
Merged

Delete _os_log_set_nscf_formatter related lines to make the framework run on macOS 10.11 #784

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d908e5
Weakly link `_os_log_set_nscf_formatter` to make the framework run on…
ikesyo Jan 11, 2017
c1dfbb3
Delete `_os_log_set_nscf_formatter` related lines as requested
ikesyo Jan 11, 2017
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
12 changes: 0 additions & 12 deletions CoreFoundation/Base.subproj/CFRuntime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -955,14 +955,6 @@ pthread_t _CF_pthread_main_thread_np(void) {

#endif

#if DEPLOYMENT_RUNTIME_SWIFT && (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED)
typedef bool (*_os_log_NSCF_callback)(const void *obj, char *string_value, size_t string_sz, bool *publicData);
extern void _os_log_set_nscf_formatter(_os_log_NSCF_callback function);
bool os_log_callback(const void *obj, char *string_value, size_t string_sz, bool *publicData) {
return false;
}
#endif


#if DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD
static void __CFInitialize(void) __attribute__ ((constructor));
Expand Down Expand Up @@ -1187,10 +1179,6 @@ void __CFInitialize(void) {

__CFProphylacticAutofsAccess = false;

#if DEPLOYMENT_RUNTIME_SWIFT && (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED)
_os_log_set_nscf_formatter(&os_log_callback);
#endif

__CFInitializing = 0;
__CFInitialized = 1;
}
Expand Down