diff options
| author | Lukas Larsson <[email protected]> | 2013-08-12 09:52:37 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2013-08-12 09:52:37 +0200 |
| commit | 675390362a7be900e17adc3eb50b898eb2a5ec97 (patch) | |
| tree | b3f5f4c02571a19476d3519853976c90a5b293fe /erts/emulator/beam/global.h | |
| parent | b43191903fd7c0f1185f630a436c60dd13b4b1b5 (diff) | |
| parent | 01a13c00f67112e7996e45439d4eec9e6aa414ce (diff) | |
| download | otp-675390362a7be900e17adc3eb50b898eb2a5ec97.tar.gz otp-675390362a7be900e17adc3eb50b898eb2a5ec97.tar.bz2 otp-675390362a7be900e17adc3eb50b898eb2a5ec97.zip | |
Merge branch 'maint'
* maint:
erts: Do not enable TRACE_SILENT when testing a ms
Diffstat (limited to 'erts/emulator/beam/global.h')
| -rwxr-xr-x | erts/emulator/beam/global.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index 2a3a45f717..7f7b6f5d1e 100755 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -1024,9 +1024,10 @@ Eterm erts_match_set_lint(Process *p, Eterm matchexpr); extern void erts_match_set_release_result(Process* p); enum erts_pam_run_flags { - ERTS_PAM_TMP_RESULT=0, - ERTS_PAM_COPY_RESULT=1, - ERTS_PAM_CONTIGUOUS_TUPLE=2 + ERTS_PAM_TMP_RESULT=1, + ERTS_PAM_COPY_RESULT=2, + ERTS_PAM_CONTIGUOUS_TUPLE=4, + ERTS_PAM_IGNORE_TRACE_SILENT=8 }; extern Eterm erts_match_set_run(Process *p, Binary *mpsp, Eterm *args, int num_args, |