summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2005-10-21 17:05:43 (GMT)
committerdgp <dgp@users.sourceforge.net>2005-10-21 17:05:43 (GMT)
commitd557adb5a1825fccdee62bab579da1201604d11c (patch)
tree0b2bb261a340aff070eb92261af1cdb70db30322
parent3a4db96f0ee46f08ff4fd6315bde872bed52b81e (diff)
downloadtcl-d557adb5a1825fccdee62bab579da1201604d11c.zip
tcl-d557adb5a1825fccdee62bab579da1201604d11c.tar.gz
tcl-d557adb5a1825fccdee62bab579da1201604d11c.tar.bz2
Revised code to build in situations where strchr(.,.) is a macro.
-rw-r--r--unix/tclUnixChan.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c
index 5162d00..111d9f3 100644
--- a/unix/tclUnixChan.c
+++ b/unix/tclUnixChan.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclUnixChan.c,v 1.61 2005/10/21 15:25:41 dkf Exp $
+ * RCS: @(#) $Id: tclUnixChan.c,v 1.62 2005/10/21 17:05:43 dgp Exp $
*/
#include "tclInt.h" /* Internal definitions for Tcl. */
@@ -1624,13 +1624,11 @@ TtyParseMode(
* sure to allow for the case where strchr is a macro. [Bug: 5089]
*/
- if (strchr(
#if defined(PAREXT) || defined(USE_TERMIO)
- "noems",
+ if (strchr("noems", parity) == NULL) {
#else
- "noe",
+ if (strchr("noe", parity) == NULL) {
#endif /* PAREXT|USE_TERMIO */
- parity) == NULL) {
if (interp != NULL) {
Tcl_AppendResult(interp, bad, " parity: should be ",
#if defined(PAREXT) || defined(USE_TERMIO)