From 1b46d1cfa5f269268b36ecdac3ae40a558392aac Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 25 Jul 2017 21:34:48 +0200
Subject: ax25ipd: USE_TERMIO is always defined.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---
 ax25ipd/Makefile.am | 1 -
 ax25ipd/io.c        | 9 ---------
 2 files changed, 10 deletions(-)

(limited to 'ax25ipd')

diff --git a/ax25ipd/Makefile.am b/ax25ipd/Makefile.am
index 6b4da75..14f019a 100644
--- a/ax25ipd/Makefile.am
+++ b/ax25ipd/Makefile.am
@@ -28,7 +28,6 @@ ax25ipd.conf.5: ax25ipd.conf.man
 
 doc_DATA = README.ax25ipd HISTORY.ax25ipd COPYING.ax25ipd
 
-AM_CFLAGS = -DUSE_TERMIO
 ax25ipd_LDADD = $(AX25_LIB)
 
 ax25ipd_SOURCES =	\
diff --git a/ax25ipd/io.c b/ax25ipd/io.c
index 5b4e236..1eae3e6 100644
--- a/ax25ipd/io.c
+++ b/ax25ipd/io.c
@@ -32,15 +32,10 @@
 #include <syslog.h>
 
 
-#ifndef USE_TERMIO
-#define USE_SGTTY
-#endif
 
 
-#ifdef USE_TERMIO
 #include <termio.h>
 static struct termio nterm;
-#endif
 
 #ifdef USE_SGTTY
 #include <sys/ioctl.h>
@@ -375,9 +370,7 @@ void io_open(void)
 		set_bpq_dev_call_and_up(ttydevice);
 		goto behind_normal_tty;
 	}
-#ifdef USE_TERMIO
 	if (ioctl(ttyfd, TCGETA, &nterm) < 0) {
-#endif
 #ifdef USE_SGTTY
 	if (ioctl(ttyfd, TIOCGETP, &nterm) < 0) {
 #endif
@@ -523,9 +516,7 @@ void io_open(void)
 	nterm.c_cc[VTIME] = 0;
 #endif /* USE_SGTTY */
 
-#ifdef USE_TERMIO
 	if (ioctl(ttyfd, TCSETA, &nterm) < 0) {
-#endif /* USE_TERMIO */
 #ifdef USE_SGTTY
 	if (ioctl (ttyfd, TIOCSETP, &nterm) < 0) {
 #endif /* USE_SGTTY */
-- 
cgit v1.2.3