diff options
author | Rickard Green <rickard@erlang.org> | 2014-02-21 11:34:29 +0100 |
---|---|---|
committer | Rickard Green <rickard@erlang.org> | 2014-02-21 11:34:29 +0100 |
commit | dd298cc2d6b21e8c387ac525bd678f0dfa8853f3 (patch) | |
tree | e59914298c52fec7fb00234eb4f22517367f3a44 /erts/emulator/beam | |
parent | 986611be9b5050969a58e8bdce864b0eb91133d5 (diff) | |
parent | 3fd4e3e770fbed95fd6fa2d547945ac71256339c (diff) | |
download | otp-dd298cc2d6b21e8c387ac525bd678f0dfa8853f3.tar.gz otp-dd298cc2d6b21e8c387ac525bd678f0dfa8853f3.tar.bz2 otp-dd298cc2d6b21e8c387ac525bd678f0dfa8853f3.zip |
Merge branch 'rickard/otp_version/OTP-11615'
* rickard/otp_version/OTP-11615:
Misc adjustments of OTP version
Diffstat (limited to 'erts/emulator/beam')
-rwxr-xr-x | erts/emulator/beam/erl_bif_info.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index f25b4dbae5..2adba9b240 100755 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -64,7 +64,7 @@ static Export *gather_gc_info_res_trap; #define DECL_AM(S) Eterm AM_ ## S = am_atom_put(#S, sizeof(#S) - 1) -static char otp_correction_package[] = ERLANG_OTP_CORRECTION_PACKAGE; +static char otp_version[] = ERLANG_OTP_VERSION; /* Keep erts_system_version as a global variable for easy access from a core */ static char erts_system_version[] = ("Erlang/OTP " ERLANG_OTP_RELEASE "%s" @@ -312,7 +312,7 @@ erts_print_system_version(int to, void *arg, Process *c_p) int i, rc = -1; char *rc_str = ""; char rc_buf[100]; - char *ocp = otp_correction_package; + char *ov = otp_version; #ifdef ERTS_SMP Uint total, online, active; #ifdef ERTS_DIRTY_SCHEDULERS @@ -323,9 +323,9 @@ erts_print_system_version(int to, void *arg, Process *c_p) (void) erts_schedulers_state(&total, &online, &active, NULL, NULL, NULL, 0); #endif #endif - for (i = 0; i < sizeof(otp_correction_package)-4; i++) { - if (ocp[i] == '-' && ocp[i+1] == 'r' && ocp[i+2] == 'c') - rc = atoi(&ocp[i+3]); + for (i = 0; i < sizeof(otp_version)-4; i++) { + if (ov[i] == '-' && ov[i+1] == 'r' && ov[i+2] == 'c') + rc = atoi(&ov[i+3]); } if (rc >= 0) { if (rc == 0) @@ -2448,10 +2448,6 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1) DECL_AM(unknown); BIF_RET(AM_unknown); } - } else if (ERTS_IS_ATOM_STR("otp_correction_package", BIF_ARG_1)) { - int n = sizeof(ERLANG_OTP_CORRECTION_PACKAGE)-1; - hp = HAlloc(BIF_P, 2*n); - BIF_RET(buf_to_intlist(&hp, ERLANG_OTP_CORRECTION_PACKAGE, n, NIL)); } else if (ERTS_IS_ATOM_STR("otp_release", BIF_ARG_1)) { int n = sizeof(ERLANG_OTP_RELEASE)-1; hp = HAlloc(BIF_P, 2*n); |