From 0601e48ef4eac0b62ecf3ab5ed654e27e2a20215 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 2 Dec 2017 23:27:23 +0100 Subject: build: remove termios check Also should be fully covered by POSIX. --- osdep/terminal-unix.c | 14 -------------- wscript | 4 ---- 2 files changed, 18 deletions(-) diff --git a/osdep/terminal-unix.c b/osdep/terminal-unix.c index eca6c69461..da6ccfe7f2 100644 --- a/osdep/terminal-unix.c +++ b/osdep/terminal-unix.c @@ -28,15 +28,7 @@ #include #include -#if HAVE_TERMIOS -#if HAVE_TERMIOS_H #include -#endif -#if HAVE_SYS_TERMIOS_H -#include -#endif -#endif - #include #include @@ -50,10 +42,8 @@ #include "misc/ctype.h" #include "terminal.h" -#if HAVE_TERMIOS static volatile struct termios tio_orig; static volatile int tio_orig_set; -#endif struct key_entry { const char *seq; @@ -282,7 +272,6 @@ static void do_activate_getch2(void) enable_kx(true); -#if HAVE_TERMIOS struct termios tio_new; tcgetattr(0,&tio_new); @@ -295,7 +284,6 @@ static void do_activate_getch2(void) tio_new.c_cc[VMIN] = 1; tio_new.c_cc[VTIME] = 0; tcsetattr(0,TCSANOW,&tio_new); -#endif getch2_active = 1; } @@ -307,13 +295,11 @@ static void do_deactivate_getch2(void) enable_kx(false); -#if HAVE_TERMIOS if (tio_orig_set) { // once set, it will never be set again // so we can cast away volatile here tcsetattr(0, TCSANOW, (const struct termios *) &tio_orig); } -#endif getch2_active = 0; } diff --git a/wscript b/wscript index 4941c53774..b8c6edc7d4 100644 --- a/wscript +++ b/wscript @@ -223,10 +223,6 @@ iconv support use --disable-iconv.", 'desc': 'w32/dos paths', 'deps': 'os-win32 || os-cygwin', 'func': check_true - }, { - 'name': '--termios', - 'desc': 'termios', - 'func': check_headers('termios.h', 'sys/termios.h'), }, { 'name': 'nanosleep', 'desc': 'nanosleep', -- cgit v1.2.3