diff options
| author | Sverker Eriksson <[email protected]> | 2013-10-15 18:02:38 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-10-15 18:02:38 +0200 |
| commit | 21270f86ab03d976ce3137c84d21e43ce6bc404b (patch) | |
| tree | 98843d726d270f8f65fa4371761829117d01239a /erts/emulator/beam/erl_process.c | |
| parent | fb43535f0dd910b9013bc0bddcdb0c27f0df53f0 (diff) | |
| parent | 356c1e9312a640ac211b6d5d4110372742acfcde (diff) | |
| download | otp-21270f86ab03d976ce3137c84d21e43ce6bc404b.tar.gz otp-21270f86ab03d976ce3137c84d21e43ce6bc404b.tar.bz2 otp-21270f86ab03d976ce3137c84d21e43ce6bc404b.zip | |
Merge branch 'maint'
Conflicts:
erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/emulator/beam/erl_process.c')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index 434d5ca147..79f382674a 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -294,7 +294,7 @@ ERTS_SCHED_PREF_QUICK_ALLOC_IMPL(proclist, ERTS_ALC_T_PROC_LIST) #define ERTS_SCHED_SLEEP_INFO_IX(IX) \ - (ASSERT_EXPR(-1 <= ((int) (IX)) \ + (ASSERT(-1 <= ((int) (IX)) \ && ((int) (IX)) < ((int) erts_no_schedulers)), \ &aligned_sched_sleep_info[(IX)].ssi) |