diff options
| author | Rickard Green <[email protected]> | 2011-09-19 11:57:43 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2011-09-19 11:57:43 +0200 |
| commit | bdc4bab74e7ea605d38f1d0b7dca4b92ec4c7f1d (patch) | |
| tree | dc988778c81ea6126fc0a3b3784800d9f1eabc8d /erts/emulator | |
| parent | 50dc9c82f71cc85ca88ba40d022b1ada941448f5 (diff) | |
| parent | 171407b6afb043c7d56fb78c8692fab3b99c4be6 (diff) | |
| download | otp-bdc4bab74e7ea605d38f1d0b7dca4b92ec4c7f1d.tar.gz otp-bdc4bab74e7ea605d38f1d0b7dca4b92ec4c7f1d.tar.bz2 otp-bdc4bab74e7ea605d38f1d0b7dca4b92ec4c7f1d.zip | |
Merge branch 'dev' into major
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/erl_threads.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/erts/emulator/beam/erl_threads.h b/erts/emulator/beam/erl_threads.h index 9b897ffd24..12eaf39ec7 100644 --- a/erts/emulator/beam/erl_threads.h +++ b/erts/emulator/beam/erl_threads.h @@ -990,8 +990,9 @@ erts_mtx_destroy(erts_mtx_t *mtx) "Most likely a bug in pthread implementation."; erts_send_warning_to_logger_str_nogl(warn); } + else #endif - erts_thr_fatal_error(res, "destroy mutex"); + erts_thr_fatal_error(res, "destroy mutex"); } #endif } @@ -1094,8 +1095,9 @@ erts_cnd_destroy(erts_cnd_t *cnd) "Most likely a bug in pthread implementation."; erts_send_warning_to_logger_str_nogl(warn); } + else #endif - erts_thr_fatal_error(res, "destroy condition variable"); + erts_thr_fatal_error(res, "destroy condition variable"); } #endif } @@ -1229,8 +1231,9 @@ erts_rwmtx_destroy(erts_rwmtx_t *rwmtx) "Most likely a bug in pthread implementation."; erts_send_warning_to_logger_str_nogl(warn); } + else #endif - erts_thr_fatal_error(res, "destroy rwmutex"); + erts_thr_fatal_error(res, "destroy rwmutex"); } #endif } @@ -1693,8 +1696,9 @@ erts_spinlock_destroy(erts_spinlock_t *lock) "Most likely a bug in pthread implementation."; erts_send_warning_to_logger_str_nogl(warn); } + else #endif - erts_thr_fatal_error(res, "destroy rwlock"); + erts_thr_fatal_error(res, "destroy rwlock"); } #else (void)lock; @@ -1811,8 +1815,9 @@ erts_rwlock_destroy(erts_rwlock_t *lock) "Most likely a bug in pthread implementation."; erts_send_warning_to_logger_str_nogl(warn); } + else #endif - erts_thr_fatal_error(res, "destroy rwlock"); + erts_thr_fatal_error(res, "destroy rwlock"); } #else (void)lock; |