diff options
| author | Sverker Eriksson <[email protected]> | 2015-11-16 15:49:16 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-11-16 15:49:16 +0100 |
| commit | c18d0917c8da1cd06f9b8f752a54ca4c5316a702 (patch) | |
| tree | 84982c3777c4ebd5a2dbbb235f4bd8f0901de64f /erts | |
| parent | 1f61a1f613486d4909f1c43b0d7ca46767e88e23 (diff) | |
| parent | 732457ffdd48d7d76a112d46ecb7b75c38c1065b (diff) | |
| download | otp-c18d0917c8da1cd06f9b8f752a54ca4c5316a702.tar.gz otp-c18d0917c8da1cd06f9b8f752a54ca4c5316a702.tar.bz2 otp-c18d0917c8da1cd06f9b8f752a54ca4c5316a702.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/test/nif_SUITE_data/nif_mod.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/test/nif_SUITE_data/nif_mod.c b/erts/emulator/test/nif_SUITE_data/nif_mod.c index 9c78c0e04d..f7e729e2b6 100644 --- a/erts/emulator/test/nif_SUITE_data/nif_mod.c +++ b/erts/emulator/test/nif_SUITE_data/nif_mod.c @@ -240,7 +240,7 @@ static ERL_NIF_TERM lib_version(ErlNifEnv* env, int argc, const ERL_NIF_TERM arg static ERL_NIF_TERM get_priv_data_ptr(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) { ADD_CALL("get_priv_data_ptr"); - return enif_make_ulong(env, (unsigned long)priv_data(env)); + return enif_make_uint64(env, (ErlNifUInt64)priv_data(env)); } static ERL_NIF_TERM make_new_resource(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]) |