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_afit_alloc.c | |
| 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_afit_alloc.c')
| -rw-r--r-- | erts/emulator/beam/erl_afit_alloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_afit_alloc.c b/erts/emulator/beam/erl_afit_alloc.c index 5850f80843..b45201af42 100644 --- a/erts/emulator/beam/erl_afit_alloc.c +++ b/erts/emulator/beam/erl_afit_alloc.c @@ -259,10 +259,10 @@ info_options(Allctr_t *allctr, * to erts_afalc_test() * \* */ -unsigned long -erts_afalc_test(unsigned long op, unsigned long a1, unsigned long a2) +UWord +erts_afalc_test(UWord op, UWord a1, UWord a2) { switch (op) { - default: ASSERT(0); return ~((unsigned long) 0); + default: ASSERT(0); return ~((UWord) 0); } } |