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/sys/win32/sys.c | |
| 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/sys/win32/sys.c')
| -rwxr-xr-x | erts/emulator/sys/win32/sys.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c index 47d12ed5fe..f19f4ebd8c 100755 --- a/erts/emulator/sys/win32/sys.c +++ b/erts/emulator/sys/win32/sys.c @@ -255,8 +255,7 @@ void erl_sys_args(int* argc, char** argv) #endif } -void -erts_sys_prepare_crash_dump(int secs) +int erts_sys_prepare_crash_dump(int secs) { Port *heart_port; Eterm heap[3]; @@ -271,10 +270,14 @@ erts_sys_prepare_crash_dump(int secs) /* send to heart port, CMD = 8, i.e. prepare crash dump =o */ erts_write_to_port(NIL, heart_port, list); + + return 1; } /* Windows - free file descriptors are hopefully available */ /* Alarm not used on windows */ + + return 0; } static void |