diff options
author | Sverker Eriksson <[email protected]> | 2016-11-22 14:52:52 +0100 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2016-11-22 14:52:52 +0100 |
commit | b62020124b3294be021d0d62073ba34cda1ae742 (patch) | |
tree | 4c68c8100bcc1d9275bf5cade63bf80286e55b4a /erts/emulator/sys/win32 | |
parent | 4683b5c227a238ee27f658bdfe2981c4b69acf09 (diff) | |
parent | 491cd4c0c0a534ab89c3ebb4c413301c91c7167d (diff) | |
download | otp-b62020124b3294be021d0d62073ba34cda1ae742.tar.gz otp-b62020124b3294be021d0d62073ba34cda1ae742.tar.bz2 otp-b62020124b3294be021d0d62073ba34cda1ae742.zip |
Merge branch 'sverker/erts/crash-dump-limit/OTP-14046' into maint
* sverker/erts/crash-dump-limit:
erts: Add env variable ERL_CRASH_DUMP_BYTES
erts: Add ErtsStrToSint64
erts: Refactor crash dumping with cbprintf
erts: Add cbprintf for Callback Printing
erts: Remove unused erl_crash_dump()
Diffstat (limited to 'erts/emulator/sys/win32')
-rw-r--r-- | erts/emulator/sys/win32/erl_win_sys.h | 2 | ||||
-rw-r--r-- | erts/emulator/sys/win32/sys.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/sys/win32/erl_win_sys.h b/erts/emulator/sys/win32/erl_win_sys.h index 04fbf23109..78005aada9 100644 --- a/erts/emulator/sys/win32/erl_win_sys.h +++ b/erts/emulator/sys/win32/erl_win_sys.h @@ -182,6 +182,8 @@ typedef LONGLONG ErtsMonotonicTime; typedef LONGLONG ErtsSysHrTime; #endif +#define ErtsStrToSint64 _strtoi64 + typedef ErtsMonotonicTime ErtsSystemTime; typedef ErtsMonotonicTime ErtsSysPerfCounter; diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c index cf821b05cb..404e72d176 100644 --- a/erts/emulator/sys/win32/sys.c +++ b/erts/emulator/sys/win32/sys.c @@ -40,7 +40,6 @@ void erts_sys_init_float(void); void erl_start(int, char**); void erts_exit(int n, char*, ...); void erl_error(char*, va_list); -void erl_crash_dump(char*, int, char*, ...); /* * Microsoft-specific function to map a WIN32 error code to a Posix errno. |