Merge branch 'pan/win64-port'

* pan/win64-port:
  Update static cache
  Back to not using 32bit time_t
  Remove ancient WaitForInputIdle workaround
  Iron out bugs in Win64 found in daily builds
  Make Win64 build work both under MSYS and Cygwin
  Fix aclocal.m4 to override changes in opu
  Make whole of OTP build and release on Win64
  Get cerl and distribution working in Win64
  Get working prompt in Win64 using bootstrap code
  Build Win64 Erlang emulator using MSYS
  Add static win64 cache

OTP-9130
OTP-9766

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);