diff options
| author | Rickard Green <[email protected]> | 2016-05-04 14:42:45 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-05-04 14:42:45 +0200 |
| commit | e7767ed5bd7dd770eab5096e0868701d59d1fa74 (patch) | |
| tree | 4c0dda9bda0f3b4f078d713a8037611eb14a03ba /erts/emulator/beam/global.h | |
| parent | 2a9fbb1c76334f0211214a0aee517ec03de0e487 (diff) | |
| parent | 19932cade31a7973120eba8db9a3b57b925f674a (diff) | |
| download | otp-e7767ed5bd7dd770eab5096e0868701d59d1fa74.tar.gz otp-e7767ed5bd7dd770eab5096e0868701d59d1fa74.tar.bz2 otp-e7767ed5bd7dd770eab5096e0868701d59d1fa74.zip | |
Merge branch 'rickard/reds-fix/master/OTP-13512'
* rickard/reds-fix/master/OTP-13512:
Ensure correct reduction counting
Diffstat (limited to 'erts/emulator/beam/global.h')
| -rw-r--r-- | erts/emulator/beam/global.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index a7bc990deb..49eec44053 100644 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -997,7 +997,7 @@ Eterm erl_is_function(Process* p, Eterm arg1, Eterm arg2); #define ERTS_CPC_ALLOW_GC (1 << 0) #define ERTS_CPC_COPY_LITERALS (1 << 1) #define ERTS_CPC_ALL (ERTS_CPC_ALLOW_GC | ERTS_CPC_COPY_LITERALS) -Eterm erts_check_process_code(Process *c_p, Eterm module, Uint flags, int *redsp); +Eterm erts_check_process_code(Process *c_p, Eterm module, Uint flags, int *redsp, int fcalls); typedef struct { Eterm *ptr; |