diff options
| author | Rickard Green <[email protected]> | 2017-05-29 15:38:40 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-05-29 15:38:40 +0200 |
| commit | 2c90f7c5afa58bbf64a27ccdf0d7f904c954fe46 (patch) | |
| tree | ace45463121a242484f2add6701632fbd77dd0aa | |
| parent | 3c00c03605b038faa94144611894280d555c2acb (diff) | |
| parent | 132fb25718f46553c538d5a26c9cab2a761515a7 (diff) | |
| download | otp-2c90f7c5afa58bbf64a27ccdf0d7f904c954fe46.tar.gz otp-2c90f7c5afa58bbf64a27ccdf0d7f904c954fe46.tar.bz2 otp-2c90f7c5afa58bbf64a27ccdf0d7f904c954fe46.zip | |
Merge branch 'rickard/wx-lock-check-fix'
OTP-14437
ERL-360
* rickard/wx-lock-check-fix:
Fix WX lock check assertion on MacOSX
| -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... */ |