diff options
| author | Sverker Eriksson <[email protected]> | 2015-11-16 15:48:08 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-11-16 15:48:08 +0100 |
| commit | 732457ffdd48d7d76a112d46ecb7b75c38c1065b (patch) | |
| tree | cad3250ec445fca345420e51f4d70d0328979762 /erts/emulator | |
| parent | c16c45a587a199987dae799ea02fb9c32216854f (diff) | |
| parent | 16293b64dee1357b36926fc62ab59bca5cfdef0b (diff) | |
| download | otp-732457ffdd48d7d76a112d46ecb7b75c38c1065b.tar.gz otp-732457ffdd48d7d76a112d46ecb7b75c38c1065b.tar.bz2 otp-732457ffdd48d7d76a112d46ecb7b75c38c1065b.zip | |
Merge branch 'sverk/nif_SUITE-win64-long-bug' into maint
* sverk/nif_SUITE-win64-long-bug:
erts: Fix nif_SUITE for win64
Diffstat (limited to 'erts/emulator')
| -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[]) |