diff options
| author | Rickard Green <[email protected]> | 2011-02-25 12:21:18 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2011-02-25 12:21:18 +0100 |
| commit | f36365ab30f9e2811e8d9e2fc342bb1f4eac45ed (patch) | |
| tree | ada934e56757d1b4612e3700f41ead7bf6182353 /erts/emulator/beam/sys.h | |
| parent | 499b3cffeceb3795f51b1046ad629a49d3ccdc65 (diff) | |
| parent | 26bff7f4c9b6477b18be4ab82204c3d294d58943 (diff) | |
| download | otp-f36365ab30f9e2811e8d9e2fc342bb1f4eac45ed.tar.gz otp-f36365ab30f9e2811e8d9e2fc342bb1f4eac45ed.tar.bz2 otp-f36365ab30f9e2811e8d9e2fc342bb1f4eac45ed.zip | |
Merge branch 'rickard/mtx-destroy-ebusy/OTP-9009' into dev
* rickard/mtx-destroy-ebusy/OTP-9009:
Send warning instead of abort on EBUSY from pthread_mutex_destroy
Diffstat (limited to 'erts/emulator/beam/sys.h')
| -rw-r--r-- | erts/emulator/beam/sys.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h index 4ed11cf418..ff828ae889 100644 --- a/erts/emulator/beam/sys.h +++ b/erts/emulator/beam/sys.h @@ -331,6 +331,10 @@ typedef unsigned char byte; (((size_t) 8) - (((size_t) (X)) & ((size_t) 7))) #include "erl_lock_check.h" + +/* needed by erl_smp.h */ +int erts_send_warning_to_logger_str_nogl(char *); + #include "erl_smp.h" #ifdef ERTS_WANT_BREAK_HANDLING @@ -517,7 +521,8 @@ int erts_send_info_to_logger_nogl(erts_dsprintf_buf_t *); int erts_send_warning_to_logger_nogl(erts_dsprintf_buf_t *); int erts_send_error_to_logger_nogl(erts_dsprintf_buf_t *); int erts_send_info_to_logger_str_nogl(char *); -int erts_send_warning_to_logger_str_nogl(char *); +/* needed by erl_smp.h (declared above) + int erts_send_warning_to_logger_str_nogl(char *); */ int erts_send_error_to_logger_str_nogl(char *); typedef struct preload { |