diff options
| author | Patrik Nyblom <[email protected]> | 2011-12-09 19:55:50 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-12-09 19:55:57 +0100 |
| commit | f20b520b0d2d990ab70b56345b63a8b508edde1a (patch) | |
| tree | b9df775ae522e006ca670215e96b86d722413f9b /erts/emulator/beam/erl_alloc.c | |
| parent | 40bc5cf36abb9697f07f788fa679a7d18903ba14 (diff) | |
| parent | e3b1ff5a7168b221f227853e82433b84504db1fc (diff) | |
| download | otp-f20b520b0d2d990ab70b56345b63a8b508edde1a.tar.gz otp-f20b520b0d2d990ab70b56345b63a8b508edde1a.tar.bz2 otp-f20b520b0d2d990ab70b56345b63a8b508edde1a.zip | |
Merge branch 'pan/win64-fixes'
* pan/win64-fixes:
Update INSTALL-WIN32.md to reflect changes in R15B
Make erl_alloc.c use correct strtol variant on windows
Set absolute limit on number of threads in ethread_SUITE
OTP-9130
Diffstat (limited to 'erts/emulator/beam/erl_alloc.c')
| -rw-r--r-- | erts/emulator/beam/erl_alloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c index 1e75afe6f6..4d02a67d54 100644 --- a/erts/emulator/beam/erl_alloc.c +++ b/erts/emulator/beam/erl_alloc.c @@ -1095,7 +1095,7 @@ get_kb_value(char *param_end, char** argv, int* ip) char *param = argv[*ip]+1; char *value = get_value(param_end, argv, ip); errno = 0; - tmp = (Sint) strtol(value, &rest, 10); + tmp = (Sint) ErtsStrToSint(value, &rest, 10); if (errno != 0 || rest == value || tmp < 0 || max < ((Uint) tmp)) bad_value(param, param_end, value); if (max == (Uint) tmp) @@ -1112,7 +1112,7 @@ get_byte_value(char *param_end, char** argv, int* ip) char *param = argv[*ip]+1; char *value = get_value(param_end, argv, ip); errno = 0; - tmp = (Sint) strtol(value, &rest, 10); + tmp = (Sint) ErtsStrToSint(value, &rest, 10); if (errno != 0 || rest == value || tmp < 0) bad_value(param, param_end, value); return (Uint) tmp; @@ -1126,7 +1126,7 @@ get_amount_value(char *param_end, char** argv, int* ip) char *param = argv[*ip]+1; char *value = get_value(param_end, argv, ip); errno = 0; - tmp = (Sint) strtol(value, &rest, 10); + tmp = (Sint) ErtsStrToSint(value, &rest, 10); if (errno != 0 || rest == value || tmp < 0) bad_value(param, param_end, value); return (Uint) tmp; |