aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_time_sup.c
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2011-06-08 10:00:48 +0200
committerPatrik Nyblom <[email protected]>2011-12-02 15:21:10 +0100
commitf2fce18b897189a60c518017704bf3b100451a93 (patch)
tree17e77a595f8f0f5c1f20813985b8a346b22abeee /erts/emulator/beam/erl_time_sup.c
parent7f9e276476c4939cf3c79f6786abf0b714cee333 (diff)
downloadotp-f2fce18b897189a60c518017704bf3b100451a93.tar.gz
otp-f2fce18b897189a60c518017704bf3b100451a93.tar.bz2
otp-f2fce18b897189a60c518017704bf3b100451a93.zip
Get cerl and distribution working in Win64
Can still not setup -a, but cerl works.
Diffstat (limited to 'erts/emulator/beam/erl_time_sup.c')
-rw-r--r--erts/emulator/beam/erl_time_sup.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/erts/emulator/beam/erl_time_sup.c b/erts/emulator/beam/erl_time_sup.c
index ca4b54188e..4d1e1c8a59 100644
--- a/erts/emulator/beam/erl_time_sup.c
+++ b/erts/emulator/beam/erl_time_sup.c
@@ -421,11 +421,11 @@ erts_init_time_sup(void)
/* info functions */
void
-elapsed_time_both(unsigned long *ms_user, unsigned long *ms_sys,
- unsigned long *ms_user_diff, unsigned long *ms_sys_diff)
+elapsed_time_both(UWord *ms_user, UWord *ms_sys,
+ UWord *ms_user_diff, UWord *ms_sys_diff)
{
- unsigned long prev_total_user, prev_total_sys;
- unsigned long total_user, total_sys;
+ UWord prev_total_user, prev_total_sys;
+ UWord total_user, total_sys;
SysTimes now;
sys_times(&now);
@@ -456,9 +456,9 @@ elapsed_time_both(unsigned long *ms_user, unsigned long *ms_sys,
/* wall clock routines */
void
-wall_clock_elapsed_time_both(unsigned long *ms_total, unsigned long *ms_diff)
+wall_clock_elapsed_time_both(UWord *ms_total, UWord *ms_diff)
{
- unsigned long prev_total;
+ UWord prev_total;
SysTimeval tv;
erts_smp_mtx_lock(&erts_timeofday_mtx);