diff options
| author | Rickard Green <[email protected]> | 2017-04-24 11:33:00 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-04-24 11:33:00 +0200 |
| commit | 515dc2d603d449ed3621d96028ba403aef05ea7f (patch) | |
| tree | a28ea65c6a4ecabebc3d9f539ae552ac3afe8721 /erts/emulator/sys/unix/erl_unix_sys.h | |
| parent | 37158d81c8a49d77b8ba32dbc560b3064127e24d (diff) | |
| parent | e91a9ccc0f95edee164139fa9b6ce2db0cb154b6 (diff) | |
| download | otp-515dc2d603d449ed3621d96028ba403aef05ea7f.tar.gz otp-515dc2d603d449ed3621d96028ba403aef05ea7f.tar.bz2 otp-515dc2d603d449ed3621d96028ba403aef05ea7f.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
Do not ignore SIGTERM when VM has been started with +Bi
Conflicts:
OTP_VERSION
erts/emulator/sys/unix/sys.c
erts/vsn.mk
Diffstat (limited to 'erts/emulator/sys/unix/erl_unix_sys.h')
| -rw-r--r-- | erts/emulator/sys/unix/erl_unix_sys.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/sys/unix/erl_unix_sys.h b/erts/emulator/sys/unix/erl_unix_sys.h index bd554238b7..aa373e76bc 100644 --- a/erts/emulator/sys/unix/erl_unix_sys.h +++ b/erts/emulator/sys/unix/erl_unix_sys.h @@ -322,6 +322,7 @@ extern SIGFUNC sys_signal(int, SIGFUNC); extern void sys_sigrelease(int); extern void sys_sigblock(int); extern void sys_init_suspend_handler(void); +extern void erts_sys_unix_later_init(void); /* * Handling of floating point exceptions. |