diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-05-06 17:42:58 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-05-06 17:42:58 +0200 |
| commit | ea3024202d8dfedfafa62a15286157d3843957cb (patch) | |
| tree | 35e3bb9c80eba604aa7bcd460c657658171cda20 /erts/emulator/beam/erl_bif_trace.c | |
| parent | 60c5ebfa0f56b5e1791b2fd408c243d6a280a393 (diff) | |
| parent | 691f8f7f180e970aea155d1741cd9f5e66741a20 (diff) | |
| download | otp-ea3024202d8dfedfafa62a15286157d3843957cb.tar.gz otp-ea3024202d8dfedfafa62a15286157d3843957cb.tar.bz2 otp-ea3024202d8dfedfafa62a15286157d3843957cb.zip | |
Merge branch 'nox/fix-warnings/OTP-11086' into maint
* nox/fix-warnings/OTP-11086:
Fix some sign warnings found with Clang
Fix a shift/reduce conflicts warning in icparse
Fix two deprecation warnings in com.ericsson.otp.ic.Environment
Define matherr only on platforms where it is used
Properly declare _sigaction on Darwin
Properly mark Uint literals as unsigned in big.c
Do not use -mdynamic-no-pic on Darwin
Diffstat (limited to 'erts/emulator/beam/erl_bif_trace.c')
| -rw-r--r-- | erts/emulator/beam/erl_bif_trace.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_bif_trace.c b/erts/emulator/beam/erl_bif_trace.c index 41c98bbffb..559cb3efa1 100644 --- a/erts/emulator/beam/erl_bif_trace.c +++ b/erts/emulator/beam/erl_bif_trace.c @@ -1224,9 +1224,7 @@ trace_info_func(Process* p, Eterm func_spec, Eterm key) match_spec_meta = NIL; } if (r & FUNC_TRACE_COUNT_TRACE) { - c = count < 0 ? - erts_make_integer(-count-1, p) : - erts_make_integer(count, p); + c = erts_make_integer(count, p); } if (r & FUNC_TRACE_TIME_TRACE) { ct = call_time; |