aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2014-04-30 00:05:58 +0100
committerThomas Adam <thomas@xteddy.org>2014-04-30 00:05:58 +0100
commitea5a223a2e8901fa9afa991d147751d8a6789443 (patch)
tree57794c023312f59bf438e01f45a31089293a3aff
parentafb4dbd4655a1f0c988d8c65723172144ab79cce (diff)
parent5b2c8156d528f284c63bc0a698805e4461431257 (diff)
downloadrtmux-ea5a223a2e8901fa9afa991d147751d8a6789443.tar.gz
rtmux-ea5a223a2e8901fa9afa991d147751d8a6789443.tar.bz2
rtmux-ea5a223a2e8901fa9afa991d147751d8a6789443.zip
Merge branch 'obsd-master'
-rw-r--r--client.c1
-rw-r--r--tty.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/client.c b/client.c
index 2d4a93b5..0c9f9cba 100644
--- a/client.c
+++ b/client.c
@@ -25,6 +25,7 @@
#include <errno.h>
#include <event.h>
+#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
diff --git a/tty.c b/tty.c
index e17a134d..7688e90b 100644
--- a/tty.c
+++ b/tty.c
@@ -193,7 +193,7 @@ tty_init_termios(int fd, struct termios *orig_tio, struct bufferevent *bufev)
tio.c_iflag |= IGNBRK;
tio.c_oflag &= ~(OPOST|ONLCR|OCRNL|ONLRET);
tio.c_lflag &= ~(IEXTEN|ICANON|ECHO|ECHOE|ECHONL|ECHOCTL|
- ECHOPRT|ECHOKE|ECHOCTL|ISIG);
+ ECHOPRT|ECHOKE|ISIG);
tio.c_cc[VMIN] = 1;
tio.c_cc[VTIME] = 0;
if (tcsetattr(fd, TCSANOW, &tio) == 0)