ncurses 6.2 - patch 20200906

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

diff --git a/ncurses/tinfo/lib_kernel.c b/ncurses/tinfo/lib_kernel.c
index 37f70842907d755b5f53e2138b95b10aeb39b158..84ec299ff503796b80af1af08a451e073d66ea51 100644 (file)
--- a/ncurses/tinfo/lib_kernel.c
+++ b/ncurses/tinfo/lib_kernel.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -48,7 +49,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_kernel.c,v 1.31 2010/12/19 01:21:19 tom Exp $")
+MODULE_ID("$Id: lib_kernel.c,v 1.33 2020/09/05 21:37:57 tom Exp $")
 
 static int
 _nc_vdisable(void)
@@ -91,6 +92,8 @@ NCURSES_SP_NAME(erasechar) (NCURSES_SP_DCL0)
        result = termp->Ottyb.c_cc[VERASE];
        if (result == _nc_vdisable())
            result = ERR;
+#elif defined(EXP_WIN32_DRIVER)
+       result = ERR;
 #else
        result = termp->Ottyb.sg_erase;
 #endif
@@ -126,6 +129,8 @@ NCURSES_SP_NAME(killchar) (NCURSES_SP_DCL0)
        result = termp->Ottyb.c_cc[VKILL];
        if (result == _nc_vdisable())
            result = ERR;
+#elif defined(EXP_WIN32_DRIVER)
+       result = ERR;
 #else
        result = termp->Ottyb.sg_kill;
 #endif
@@ -161,7 +166,11 @@ NCURSES_SP_NAME(flushinp) (NCURSES_SP_DCL0)
 #else
        errno = 0;
        do {
+#if defined(EXP_WIN32_DRIVER)
+           _nc_console_flush(_nc_console_fd2handle(termp->Filedes));
+#else
            ioctl(termp->Filedes, TIOCFLUSH, 0);
+#endif
        } while
            (errno == EINTR);
 #endif