Fix TCGETWINSZ compat.

--HG--
branch : 1.7

diff --git a/exec_pty.c b/exec_pty.c
index 9c152d8f6e22b498d837799c8abd0ac031703d91..19898905a0471ac8694eb1ce2305f37f27c133f2 100644 (file)
--- a/exec_pty.c
+++ b/exec_pty.c
@@ -76,7 +76,7 @@
 # define TIOCGWINSZ    TIOCGSIZE
 # define TIOCSWINSZ    TIOCSSIZE
 # define winsize       ttysize
-# define ws_cols       ts_col
+# define ws_col                ts_cols
 #endif
 
 struct io_buffer {

diff --git a/lbuf.c b/lbuf.c
index 4ec2262189c353d763bc772858fc8c281ba676b6..78c16adcbf6000fdf66347ae03fae2f11fae3541 100644 (file)
--- a/lbuf.c
+++ b/lbuf.c
@@ -58,7 +58,7 @@
 #if !defined(TIOCGWINSZ) && defined(TIOCGSIZE)
 # define TIOCGWINSZ    TIOCGSIZE
 # define winsize       ttysize
-# define ws_cols       ts_col
+# define ws_col                ts_cols
 #endif
 
 int
@@ -69,8 +69,8 @@ get_ttycols()
 #ifdef TIOCGWINSZ
     struct winsize wsize;
 
-    if (ioctl(STDERR_FILENO, TIOCGWINSZ, &wsize) == 0 && wsize.ws_cols != 0)
-       return((int)wsize.ws_cols);
+    if (ioctl(STDERR_FILENO, TIOCGWINSZ, &wsize) == 0 && wsize.ws_col != 0)
+       return((int)wsize.ws_col);
 #endif
 
     /* Fall back on $COLUMNS. */