diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-04-04 11:55:53 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-04-04 11:55:53 +0200 |
| commit | a5af6ab951919b68142bfebe8245c874ef31585a (patch) | |
| tree | 304f03a867081cf328ef2c45fff81497d0feb87a /erts | |
| parent | c69d49dce0daff8d202bac6068527a912f7072de (diff) | |
| parent | bad78f7daf7299603ea807c90839450a5f1307ce (diff) | |
| download | otp-a5af6ab951919b68142bfebe8245c874ef31585a.tar.gz otp-a5af6ab951919b68142bfebe8245c874ef31585a.tar.bz2 otp-a5af6ab951919b68142bfebe8245c874ef31585a.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/etc/unix/run_erl.c | 2 | ||||
| -rw-r--r-- | erts/etc/unix/to_erl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c index 910be3dce8..a3bcdb85d9 100644 --- a/erts/etc/unix/run_erl.c +++ b/erts/etc/unix/run_erl.c @@ -682,7 +682,7 @@ static void pass_on(pid_t childpid) } } - if (!got_some && wfd && buf[0] == '\022') { + if (!got_some && wfd && buf[0] == '\014') { char wbuf[30]; int wlen = sn_printf(wbuf,sizeof(wbuf),"[run_erl v%u-%u]\n", RUN_ERL_HI_VER, RUN_ERL_LO_VER); diff --git a/erts/etc/unix/to_erl.c b/erts/etc/unix/to_erl.c index 754b349338..094006c5fd 100644 --- a/erts/etc/unix/to_erl.c +++ b/erts/etc/unix/to_erl.c @@ -353,7 +353,7 @@ int main(int argc, char **argv) * at the start of every new to_erl-session. */ - if (write(wfd, "\022", 1) < 0) { + if (write(wfd, "\014", 1) < 0) { fprintf(stderr, "Error in writing ^R to FIFO.\n"); } |