diff options
| author | Sverker Eriksson <[email protected]> | 2013-05-22 11:53:28 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-05-22 11:53:28 +0200 |
| commit | 01eb20066918e107811d01f43b97e3925f894dbd (patch) | |
| tree | 665f0890c28464022040ad6ce9bb045f544fef49 /erts/emulator/beam/erl_bestfit_alloc.h | |
| parent | 4bd041e74b5e3e1356a10bb0188aab37521d717a (diff) | |
| parent | c746dd9c73f19588712b4d35e3bab96036348d23 (diff) | |
| download | otp-01eb20066918e107811d01f43b97e3925f894dbd.tar.gz otp-01eb20066918e107811d01f43b97e3925f894dbd.tar.bz2 otp-01eb20066918e107811d01f43b97e3925f894dbd.zip | |
Merge branch 'sverk/win64-fixes' into maint
* sverk/win64-fixes:
erts: Change some more 'long' to pointer sized int (ErlDrvUInt)
erts: Fix crash in nif_SUITE for win64
erts: Fix assert in isdigit for negative characters
Diffstat (limited to 'erts/emulator/beam/erl_bestfit_alloc.h')
| -rw-r--r-- | erts/emulator/beam/erl_bestfit_alloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_bestfit_alloc.h b/erts/emulator/beam/erl_bestfit_alloc.h index 0c29662852..f2d2f07d7a 100644 --- a/erts/emulator/beam/erl_bestfit_alloc.h +++ b/erts/emulator/beam/erl_bestfit_alloc.h @@ -59,7 +59,7 @@ struct BFAllctr_t_ { int address_order; }; -unsigned long erts_bfalc_test(unsigned long, unsigned long, unsigned long); +UWord erts_bfalc_test(UWord, UWord, UWord); #endif /* #if defined(GET_ERL_BF_ALLOC_IMPL) && !defined(ERL_BF_ALLOC_IMPL__) */ |