diff options
| author | Marcus Arendt <[email protected]> | 2014-11-06 10:31:17 +0100 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-11-06 10:31:17 +0100 |
| commit | 5349afa77f6daca3525ed1b5e1081c5379a4ca65 (patch) | |
| tree | 6946538dcfd67d94538bdb458a7bc2f2361f24e4 /erts/emulator | |
| parent | 7fd8d5185205ab7d79d7e45a7275643ee7154f95 (diff) | |
| parent | 6aefe74c0de57e2f5d873b6658396b106aff4f75 (diff) | |
| download | otp-5349afa77f6daca3525ed1b5e1081c5379a4ca65.tar.gz otp-5349afa77f6daca3525ed1b5e1081c5379a4ca65.tar.bz2 otp-5349afa77f6daca3525ed1b5e1081c5379a4ca65.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/erl_bif_info.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index e92842c7d1..3839d80cc4 100644 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -90,7 +90,7 @@ static char erts_system_version[] = ("Erlang/OTP " ERLANG_OTP_RELEASE " [smp:%beu:%beu]" #endif #ifdef USE_THREADS -#ifdef ERTS_DIRTY_SCHEDULERS +#if defined(ERTS_DIRTY_SCHEDULERS) && defined(ERTS_SMP) " [ds:%beu:%beu:%beu]" #endif " [async-threads:%d]" |