summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjenglish <jenglish@flightlab.com>2013-02-27 22:12:43 (GMT)
committerjenglish <jenglish@flightlab.com>2013-02-27 22:12:43 (GMT)
commitd4bfb2aaa89124340478a0450708603e77b6dc17 (patch)
tree61aeba366f4e36ab39e9a4e9e44647e8981c29b5
parent2d72995bd43fdc603ea4164122e285c0e546d62d (diff)
downloadtcl-d4bfb2aaa89124340478a0450708603e77b6dc17.zip
tcl-d4bfb2aaa89124340478a0450708603e77b6dc17.tar.gz
tcl-d4bfb2aaa89124340478a0450708603e77b6dc17.tar.bz2
ifdef reduction - missed a couple spots (#if ... defined(USE_TERMIO))
-rw-r--r--unix/tclUnixChan.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c
index a0d9b3f..fb84cb3 100644
--- a/unix/tclUnixChan.c
+++ b/unix/tclUnixChan.c
@@ -1282,20 +1282,20 @@ TtyParseMode(
*/
if (
-#if defined(PAREXT) || defined(USE_TERMIO)
+#if defined(PAREXT)
strchr("noems", parity)
#else
strchr("noe", parity)
-#endif /* PAREXT|USE_TERMIO */
+#endif /* PAREXT */
== NULL) {
if (interp != NULL) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
"%s parity: should be %s", bad,
-#if defined(PAREXT) || defined(USE_TERMIO)
+#if defined(PAREXT)
"n, o, e, m, or s"
#else
"n, o, or e"
-#endif /* PAREXT|USE_TERMIO */
+#endif /* PAREXT */
));
Tcl_SetErrorCode(interp, "TCL", "VALUE", "SERIALMODE", NULL);
}
@@ -1357,7 +1357,6 @@ TtyInit(
if (initialize) {
IOSTATE iostate = ttyPtr->savedState;
-#if defined(USE_TERMIOS) || defined(USE_TERMIO)
if (iostate.c_iflag != IGNBRK
|| iostate.c_oflag != 0
|| iostate.c_lflag != 0
@@ -1372,8 +1371,6 @@ TtyInit(
SET_BITS(iostate.c_cflag, CREAD);
iostate.c_cc[VMIN] = 1;
iostate.c_cc[VTIME] = 0;
-#endif /* USE_TERMIOS|USE_TERMIO */
-
/*
* Only update if we're changing anything to avoid possible blocking.