diff options
| author | Sverker Eriksson <[email protected]> | 2017-01-23 17:37:49 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-01-23 17:37:49 +0100 |
| commit | adce9147ba242a8aef7d10cbbe8e4375ecdff0aa (patch) | |
| tree | 688710d8612f621f7bcec662d1cf6f6fc5804ee3 /lib | |
| parent | 3f5530bf1ec283bbb8fd75e57947fe3218148ca1 (diff) | |
| parent | 9e862df2bf26b9b1d79ba3b447945b7c0612e3d0 (diff) | |
| download | otp-adce9147ba242a8aef7d10cbbe8e4375ecdff0aa.tar.gz otp-adce9147ba242a8aef7d10cbbe8e4375ecdff0aa.tar.bz2 otp-adce9147ba242a8aef7d10cbbe8e4375ecdff0aa.zip | |
Merge branch 'sverker/ASSERT_IN_ENV'
* sverker/ASSERT_IN_ENV:
erts: Add macro ERTS_PROC_LOCKS_HIGHER_THAN
erts: Cleanup and extra assertions in nif_SUITE.c
erts: Cleanup enif_make_reverse_list
erts: Add assertions for correct ErlNifEnv
erts: Make erts_dbg_within_proc available
# Conflicts:
# erts/emulator/beam/erl_gc.h
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions