diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-12-06 15:42:18 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-12-06 15:42:18 +0100 |
| commit | 6bc9c65ae207ebc2fba03521c2ca3b84264a1dcf (patch) | |
| tree | 7017f536fe5557b1494d1b3844ff776b5bfcae40 /erts/emulator/beam/sys.h | |
| parent | 51f1f06bafa99291daaafe22a24a1dc4ff45d067 (diff) | |
| parent | 1cbd897c43f0dab1275392a3736e4629c1f80243 (diff) | |
| download | otp-6bc9c65ae207ebc2fba03521c2ca3b84264a1dcf.tar.gz otp-6bc9c65ae207ebc2fba03521c2ca3b84264a1dcf.tar.bz2 otp-6bc9c65ae207ebc2fba03521c2ca3b84264a1dcf.zip | |
Merge branch 'maint'
Conflicts:
erts/emulator/sys/vxworks/sys.c
erts/vsn.mk
lib/ssl/src/ssl_connection.erl
lib/ssl/test/ssl_basic_SUITE.erl
Diffstat (limited to 'erts/emulator/beam/sys.h')
| -rw-r--r-- | erts/emulator/beam/sys.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h index c5af5b9577..f5f10bb616 100644 --- a/erts/emulator/beam/sys.h +++ b/erts/emulator/beam/sys.h @@ -644,7 +644,7 @@ void erts_sys_schedule_interrupt_timed(int set, erts_short_time_t msec); void erts_sys_main_thread(void); #endif -extern void erts_sys_prepare_crash_dump(int secs); +extern int erts_sys_prepare_crash_dump(int secs); extern void erts_sys_pre_init(void); extern void erl_sys_init(void); extern void erl_sys_args(int *argc, char **argv); |