From e61715de39af65bd575c31be9ffe8f77eb4614e8 Mon Sep 17 00:00:00 2001 From: David Greenman Date: Sat, 11 Nov 2000 23:03:38 +0000 Subject: Changed variable killchar to killch and erasechar to erasech to avoid a name clash with the library functions of the same name (in libncurses). This problem was masked when building tset shared (the local symbols had precedence), but caused tset to core dump when it was built -static. --- usr.bin/tset/set.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'usr.bin/tset/set.c') diff --git a/usr.bin/tset/set.c b/usr.bin/tset/set.c index e5c52cff08a3..515a87da16a5 100644 --- a/usr.bin/tset/set.c +++ b/usr.bin/tset/set.c @@ -169,19 +169,19 @@ set_control_chars() else bs_char = 0; - if (erasechar == 0 && bs_char != 0 && !tgetflag("os")) - erasechar = -1; - if (erasechar < 0) - erasechar = (bs_char != 0) ? bs_char : CTRL('h'); + if (erasech == 0 && bs_char != 0 && !tgetflag("os")) + erasech = -1; + if (erasech < 0) + erasech = (bs_char != 0) ? bs_char : CTRL('h'); - if (mode.c_cc[VERASE] == 0 || erasechar != 0) - mode.c_cc[VERASE] = erasechar ? erasechar : CERASE; + if (mode.c_cc[VERASE] == 0 || erasech != 0) + mode.c_cc[VERASE] = erasech ? erasech : CERASE; if (mode.c_cc[VINTR] == 0 || intrchar != 0) mode.c_cc[VINTR] = intrchar ? intrchar : CINTR; - if (mode.c_cc[VKILL] == 0 || killchar != 0) - mode.c_cc[VKILL] = killchar ? killchar : CKILL; + if (mode.c_cc[VKILL] == 0 || killch != 0) + mode.c_cc[VKILL] = killch ? killch : CKILL; } /* -- cgit v1.2.3