diff options
| author | Lukas Larsson <[email protected]> | 2019-02-01 10:26:23 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-02-01 10:26:23 +0100 |
| commit | 6719ef2d144fe3b6e374d60b04b41ebaef304a7a (patch) | |
| tree | d0524389c4374ac72fde2e4f186e4b17ce8218c9 /erts | |
| parent | 7635968efa93e5d41acd581145c7e1e19686e670 (diff) | |
| parent | e7b3656bae68d14435eca2de9a7efbdb62b83f07 (diff) | |
| download | otp-6719ef2d144fe3b6e374d60b04b41ebaef304a7a.tar.gz otp-6719ef2d144fe3b6e374d60b04b41ebaef304a7a.tar.bz2 otp-6719ef2d144fe3b6e374d60b04b41ebaef304a7a.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/erl_bif_info.c | 2 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_init.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index 8fb8bd2831..6f4e34e1a8 100644 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -2965,7 +2965,7 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1) } else if (ERTS_IS_ATOM_STR("context_reductions", BIF_ARG_1)) { BIF_RET(make_small(CONTEXT_REDS)); } else if (ERTS_IS_ATOM_STR("kernel_poll", BIF_ARG_1)) { -#ifdef ERTS_ENABLE_KERNEL_POLL +#if ERTS_ENABLE_KERNEL_POLL BIF_RET(am_true); #else BIF_RET(am_false); diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c index c0a86ea738..12750b9aa6 100644 --- a/erts/emulator/beam/erl_init.c +++ b/erts/emulator/beam/erl_init.c @@ -78,7 +78,7 @@ const char etp_erts_version[] = ERLANG_VERSION; const char etp_otp_release[] = ERLANG_OTP_RELEASE; const char etp_compile_date[] = ERLANG_COMPILE_DATE; const char etp_arch[] = ERLANG_ARCHITECTURE; -#ifdef ERTS_ENABLE_KERNEL_POLL +#if ERTS_ENABLE_KERNEL_POLL const int erts_use_kernel_poll = 1; const int etp_kernel_poll_support = 1; #else |