diff options
author | Sverker Eriksson <[email protected]> | 2016-09-23 16:03:55 +0200 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2016-09-23 16:03:55 +0200 |
commit | f145a56e959fb3b2505dc9f3cf9b7be5ade53125 (patch) | |
tree | e55bcddd3a0904c731e6126136d0862b84c28d2b /erts/emulator/test/trace_call_time_SUITE_data/trace_nif.c | |
parent | 7228e3ea97f8e2a19be97740053892e67cc20baf (diff) | |
parent | a54773f05cd60045a4ac0f9a4ae753aa76185b61 (diff) | |
download | otp-f145a56e959fb3b2505dc9f3cf9b7be5ade53125.tar.gz otp-f145a56e959fb3b2505dc9f3cf9b7be5ade53125.tar.bz2 otp-f145a56e959fb3b2505dc9f3cf9b7be5ade53125.zip |
Merge branch 'sverker/remove-nif-reload/OTP-13908'
* sverker/remove-nif-reload:
erts: Cuddle nif_SUITE:consume_timeslice
erts: Remove old doc note for erlang:load_nif
erts: Remove deprecated nif 'reload' feature
erts: Fix trace_nif_SUITE to load nif lib only once
Diffstat (limited to 'erts/emulator/test/trace_call_time_SUITE_data/trace_nif.c')
-rw-r--r-- | erts/emulator/test/trace_call_time_SUITE_data/trace_nif.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/erts/emulator/test/trace_call_time_SUITE_data/trace_nif.c b/erts/emulator/test/trace_call_time_SUITE_data/trace_nif.c index b8c8590546..786be35c9c 100644 --- a/erts/emulator/test/trace_call_time_SUITE_data/trace_nif.c +++ b/erts/emulator/test/trace_call_time_SUITE_data/trace_nif.c @@ -6,11 +6,6 @@ static int load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info) return 0; } -static int reload(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info) -{ - return 0; -} - static int upgrade(ErlNifEnv* env, void** priv_data, void** old_priv_data, ERL_NIF_TERM load_info) { return 0; @@ -34,4 +29,4 @@ static ErlNifFunc nif_funcs[] = {"nif_dec", 1, nif_dec_1} }; -ERL_NIF_INIT(trace_call_time_SUITE,nif_funcs,load,reload,upgrade,unload) +ERL_NIF_INIT(trace_call_time_SUITE,nif_funcs,load,NULL,upgrade,unload) |