diff options
| author | John Högberg <[email protected]> | 2017-06-27 15:52:56 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-06-27 15:52:56 +0200 |
| commit | 0dced656e6871e03a153bb99af10d8710ffca7d9 (patch) | |
| tree | 6fee44d1d76d0b96a4c6f4e7bd104b69b60b316f /erts/emulator/beam/erl_utils.h | |
| parent | 798924ffd5efff77ba94ea7f54c2e69548d9d07e (diff) | |
| parent | 8d9cde83b628533ae7a5fe85a5dd9c6c00c084e3 (diff) | |
| download | otp-0dced656e6871e03a153bb99af10d8710ffca7d9.tar.gz otp-0dced656e6871e03a153bb99af10d8710ffca7d9.tar.bz2 otp-0dced656e6871e03a153bb99af10d8710ffca7d9.zip | |
Merge branch 'maint-19' into maint
* maint-19:
Updated OTP version
Update release notes
Update version numbers
Fix statistics(wall_clock) and statistics(runtime) implementation
fixup! erts: Cleanup dropped port tasks correctly
erts: Add tests to detect port close race
Add a testcase for OTP-13939/ERL-193
erts: Cleanup dropped port tasks correctly
Mark socket disconnected on tcp_send_or_shutdown_error
Diffstat (limited to 'erts/emulator/beam/erl_utils.h')
| -rw-r--r-- | erts/emulator/beam/erl_utils.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_utils.h b/erts/emulator/beam/erl_utils.h index 07cf4f6903..3d28b05752 100644 --- a/erts/emulator/beam/erl_utils.h +++ b/erts/emulator/beam/erl_utils.h @@ -131,6 +131,7 @@ Eterm erts_bld_uint(Uint **hpp, Uint *szp, Uint ui); Eterm erts_bld_uword(Uint **hpp, Uint *szp, UWord uw); Eterm erts_bld_uint64(Uint **hpp, Uint *szp, Uint64 ui64); Eterm erts_bld_sint64(Uint **hpp, Uint *szp, Sint64 si64); +#define erts_bld_monotonic_time erts_bld_sint64 Eterm erts_bld_cons(Uint **hpp, Uint *szp, Eterm car, Eterm cdr); Eterm erts_bld_tuple(Uint **hpp, Uint *szp, Uint arity, ...); #define erts_bld_tuple2(H,S,E1,E2) erts_bld_tuple(H,S,2,E1,E2) |