diff options
| author | Lukas Larsson <[email protected]> | 2015-11-02 17:41:52 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2015-11-02 17:41:52 +0100 |
| commit | 72cc231e0186d98e52f7a1debdea624d4bbf1125 (patch) | |
| tree | f70983e4c42645af09fca2a91e7e031d8783863b /erts | |
| parent | 6a421403ce98d1863f416d9ca00b8f2de07b419a (diff) | |
| parent | f76ba62c7869bb7bbda27446d0a9f7214062db4f (diff) | |
| download | otp-72cc231e0186d98e52f7a1debdea624d4bbf1125.tar.gz otp-72cc231e0186d98e52f7a1debdea624d4bbf1125.tar.bz2 otp-72cc231e0186d98e52f7a1debdea624d4bbf1125.zip | |
Merge branch 'lukas/erts/win32_bool_fix/OTP-13079' into maint
* lukas/erts/win32_bool_fix/OTP-13079:
erts: bool is a reserved word, use boolean instead
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/beam_debug.c | 6 | ||||
| -rw-r--r-- | erts/emulator/beam/bif.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/erts/emulator/beam/beam_debug.c b/erts/emulator/beam/beam_debug.c index c774a70d4c..90985e4f53 100644 --- a/erts/emulator/beam/beam_debug.c +++ b/erts/emulator/beam/beam_debug.c @@ -79,7 +79,7 @@ erts_debug_breakpoint_2(BIF_ALIST_2) { Process* p = BIF_P; Eterm MFA = BIF_ARG_1; - Eterm bool = BIF_ARG_2; + Eterm boolean = BIF_ARG_2; Eterm* tp; Eterm mfa[3]; int i; @@ -87,7 +87,7 @@ erts_debug_breakpoint_2(BIF_ALIST_2) Eterm res; BpFunctions f; - if (bool != am_true && bool != am_false) + if (boolean != am_true && boolean != am_false) goto error; if (is_not_tuple(MFA)) { @@ -124,7 +124,7 @@ erts_debug_breakpoint_2(BIF_ALIST_2) erts_smp_thr_progress_block(); erts_bp_match_functions(&f, mfa, specified); - if (bool == am_true) { + if (boolean == am_true) { erts_set_debug_break(&f); erts_install_breakpoints(&f); erts_commit_staged_bp(); diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c index 4e3a1cef69..0bd46a2dae 100644 --- a/erts/emulator/beam/bif.c +++ b/erts/emulator/beam/bif.c @@ -616,7 +616,7 @@ erts_queue_monitor_message(Process *p, } static BIF_RETTYPE -local_pid_monitor(Process *p, Eterm target, Eterm mon_ref, int bool) +local_pid_monitor(Process *p, Eterm target, Eterm mon_ref, int boolean) { BIF_RETTYPE ret; Process *rp; @@ -634,7 +634,7 @@ local_pid_monitor(Process *p, Eterm target, Eterm mon_ref, int bool) if (!rp) { erts_smp_proc_unlock(p, ERTS_PROC_LOCK_LINK); p_locks &= ~ERTS_PROC_LOCK_LINK; - if (bool) + if (boolean) ret = am_false; else erts_queue_monitor_message(p, &p_locks, @@ -643,7 +643,7 @@ local_pid_monitor(Process *p, Eterm target, Eterm mon_ref, int bool) else { ASSERT(rp != p); - if (bool) + if (boolean) ret = am_true; erts_add_monitor(&ERTS_P_MONITORS(p), MON_ORIGIN, mon_ref, target, NIL); |