diff options
| author | Rickard Green <[email protected]> | 2017-05-29 15:10:05 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-05-29 15:10:05 +0200 |
| commit | 132fb25718f46553c538d5a26c9cab2a761515a7 (patch) | |
| tree | ace45463121a242484f2add6701632fbd77dd0aa | |
| parent | 3c00c03605b038faa94144611894280d555c2acb (diff) | |
| download | otp-132fb25718f46553c538d5a26c9cab2a761515a7.tar.gz otp-132fb25718f46553c538d5a26c9cab2a761515a7.tar.bz2 otp-132fb25718f46553c538d5a26c9cab2a761515a7.zip | |
Fix WX lock check assertion on MacOSX
The fix avoids registering the main thread as an emulator thread
on MacOSX. This since WX steals the main thread for its own usage
on MacOSX, and use the thread as an ordinary driver thread.
| -rw-r--r-- | erts/emulator/sys/unix/sys.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c index b1bea3a960..5cf0a49972 100644 --- a/erts/emulator/sys/unix/sys.c +++ b/erts/emulator/sys/unix/sys.c @@ -1456,12 +1456,12 @@ erts_sys_main_thread(void) erts_thread_disable_fpe(); #ifdef __DARWIN__ initialize_darwin_main_thread_pipes(); -#endif +#else /* Become signal receiver thread... */ #ifdef ERTS_ENABLE_LOCK_CHECK erts_lc_set_thread_name("signal_receiver"); #endif - +#endif smp_sig_notify(0); /* Notify initialized */ /* Wait for a signal to arrive... */ |