diff options
| author | Patrik Nyblom <[email protected]> | 2011-12-02 15:27:13 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-12-02 15:27:40 +0100 |
| commit | 0d273c54d93fd0ddf03f98d138f302442a0f65f9 (patch) | |
| tree | 635977fc0ef2b8236c9d619c014a8b9f1d07af42 /erts/emulator/beam/erl_bif_info.c | |
| parent | 86cd971ea4fee5fb596cd06e0dc8da60f4cf65d1 (diff) | |
| parent | 42286b769c3cb6b9f8dd2dccf31e4232d6795d4e (diff) | |
| download | otp-0d273c54d93fd0ddf03f98d138f302442a0f65f9.tar.gz otp-0d273c54d93fd0ddf03f98d138f302442a0f65f9.tar.bz2 otp-0d273c54d93fd0ddf03f98d138f302442a0f65f9.zip | |
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
Diffstat (limited to 'erts/emulator/beam/erl_bif_info.c')
| -rw-r--r-- | erts/emulator/beam/erl_bif_info.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index cb918fd34c..5a806777fe 100644 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -3227,7 +3227,7 @@ BIF_RETTYPE statistics_1(BIF_ALIST_1) res = TUPLE2(hp, b1, b2); BIF_RET(res); } else if (BIF_ARG_1 == am_runtime) { - unsigned long u1, u2, dummy; + UWord u1, u2, dummy; Eterm b1, b2; elapsed_time_both(&u1,&dummy,&u2,&dummy); b1 = erts_make_integer(u1,BIF_P); |