diff options
| author | Marcus Arendt <[email protected]> | 2014-11-05 15:33:24 +0100 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-11-05 15:33:24 +0100 |
| commit | 682a6082159568f40615f03d12d44ee70edd14c6 (patch) | |
| tree | d8e0d99da58c138834e744f4186a76a238c6d5dc /erts/etc/common/run_erl_common.c | |
| parent | 7513bb7670cf7081c4b70e240f99f9424b612f0b (diff) | |
| parent | 9417f044ee3c291c2ea343c203aebdcc40597226 (diff) | |
| download | otp-682a6082159568f40615f03d12d44ee70edd14c6.tar.gz otp-682a6082159568f40615f03d12d44ee70edd14c6.tar.bz2 otp-682a6082159568f40615f03d12d44ee70edd14c6.zip | |
Merge branch 'maint-17' into maint
Conflicts:
OTP_VERSION
Diffstat (limited to 'erts/etc/common/run_erl_common.c')
| -rw-r--r-- | erts/etc/common/run_erl_common.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/erts/etc/common/run_erl_common.c b/erts/etc/common/run_erl_common.c index 580b6cc3c5..20b78eb05e 100644 --- a/erts/etc/common/run_erl_common.c +++ b/erts/etc/common/run_erl_common.c @@ -36,6 +36,10 @@ # include <syslog.h> #endif +#ifdef HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif + #ifdef __OSE__ # include "ramlog.h" #endif @@ -637,7 +641,7 @@ int erts_run_erl_open_fifo(char *pipename,char *w_pipename,char *r_pipename) { /* Extract any control sequences that are ment only for run_erl * and should not be forwarded to the pty. */ -int erts_run_erl_extract_ctrl_seq(char* buf, int len) +int erts_run_erl_extract_ctrl_seq(char* buf, int len, int mfd) { static const char prefix[] = "\033_"; static const char suffix[] = "\033\\"; @@ -662,7 +666,7 @@ int erts_run_erl_extract_ctrl_seq(char* buf, int len) struct winsize ws; ws.ws_col = col; ws.ws_row = row; - if (ioctl(MFD, TIOCSWINSZ, &ws) < 0) { + if (ioctl(mfd, TIOCSWINSZ, &ws) < 0) { ERRNO_ERR0(LOG_ERR,"Failed to set window size"); } #endif |