diff options
author | Sverker Eriksson <[email protected]> | 2016-03-01 14:30:34 +0100 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2016-03-01 14:30:34 +0100 |
commit | e1489c448b7486cdcfec6a89fea238d88e6ce2f3 (patch) | |
tree | e51068d8358245f5bc1726aec7130b9ff801b093 /erts/emulator/sys/win32/sys_time.c | |
parent | 75bc5bebc070a59535b8f6b7b9085c210b4723b5 (diff) | |
parent | 1b094d72ffc56069c72f17c7edd673dbbfe47e39 (diff) | |
download | otp-e1489c448b7486cdcfec6a89fea238d88e6ce2f3.tar.gz otp-e1489c448b7486cdcfec6a89fea238d88e6ce2f3.tar.bz2 otp-e1489c448b7486cdcfec6a89fea238d88e6ce2f3.zip |
Merge branch 'sverk/halt-INT_MIN' into maint
OTP-13251
* sverk/halt-INT_MIN:
erts: Make erlang:halt() accept bignums as Status
erts: Change erl_exit into erts_exit
kernel: Remove calls to erl_exit
Diffstat (limited to 'erts/emulator/sys/win32/sys_time.c')
-rw-r--r-- | erts/emulator/sys/win32/sys_time.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/sys/win32/sys_time.c b/erts/emulator/sys/win32/sys_time.c index 9e5f78703a..3cf7f7cf07 100644 --- a/erts/emulator/sys/win32/sys_time.c +++ b/erts/emulator/sys/win32/sys_time.c @@ -147,7 +147,7 @@ os_monotonic_time_qpc(void) LARGE_INTEGER pc; if (!(*internal_state.r.o.pQueryPerformanceCounter)(&pc)) - erl_exit(ERTS_ABORT_EXIT, "QueryPerformanceCounter() failed\n"); + erts_exit(ERTS_ABORT_EXIT, "QueryPerformanceCounter() failed\n"); return (ErtsMonotonicTime) pc.QuadPart; } @@ -164,7 +164,7 @@ os_times_qpc(ErtsMonotonicTime *mtimep, ErtsSystemTime *stimep) GetSystemTime(&st); if (!qpcr) - erl_exit(ERTS_ABORT_EXIT, "QueryPerformanceCounter() failed\n"); + erts_exit(ERTS_ABORT_EXIT, "QueryPerformanceCounter() failed\n"); *mtimep = (ErtsMonotonicTime) pc.QuadPart; @@ -251,7 +251,7 @@ sys_hrtime_qpc(void) LARGE_INTEGER pc; if (!(*internal_state.r.o.pQueryPerformanceCounter)(&pc)) - erl_exit(ERTS_ABORT_EXIT, "QueryPerformanceCounter() failed\n"); + erts_exit(ERTS_ABORT_EXIT, "QueryPerformanceCounter() failed\n"); ASSERT(pc.QuadPart > 0); |