ncurses 5.7 - patch 20090927

[ncurses.git] / ncurses / tinfo / tinfo_driver.c

diff --git a/ncurses/tinfo/tinfo_driver.c b/ncurses/tinfo/tinfo_driver.c
index d2df9911803a8c2718b678a38bc1b98d72dde42b..c824d4340298509edb4b91461762ac031ab36812 100644 (file)
--- a/ncurses/tinfo/tinfo_driver.c
+++ b/ncurses/tinfo/tinfo_driver.c
@@ -42,7 +42,15 @@
 #endif
 #endif
 
-MODULE_ID("$Id: tinfo_driver.c,v 1.1 2009/05/23 22:40:30 juergen Exp $")
+#if HAVE_SIZECHANGE
+# if !defined(sun) || !TERMIOS
+#  if HAVE_SYS_IOCTL_H
+#   include <sys/ioctl.h>
+#  endif
+# endif
+#endif
+
+MODULE_ID("$Id: tinfo_driver.c,v 1.3 2009/09/27 17:29:39 tom Exp $")
 
 /*
  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
@@ -173,7 +181,7 @@ static int
 drv_doupdate(TERMINAL_CONTROL_BLOCK * TCB)
 {
     AssertTCB();
-    return _nc_tinfo_doupdate(TCB->csp);
+    return TINFO_DOUPDATE(TCB->csp);
 }
 
 /*
@@ -945,7 +953,7 @@ drv_mvcur(TERMINAL_CONTROL_BLOCK * TCB, int yold, int xold, int ynew, int xnew)
 {
     SCREEN *sp = TCB->csp;
     AssertTCB();
-    return _nc_tinfo_mvcur(sp, yold, xold, ynew, xnew);
+    return TINFO_MVCUR(sp, yold, xold, ynew, xnew);
 }
 
 static void
@@ -1383,7 +1391,7 @@ drv_kyExist(TERMINAL_CONTROL_BLOCK * TCB, int key)
 
     AssertTCB();
     if (TCB->csp)
-       res = _nc_tinfo_has_key(TCB->csp, key) == 0 ? FALSE : TRUE;
+       res = TINFO_HAS_KEY(TCB->csp, key) == 0 ? FALSE : TRUE;
 
     return res;
 }