From c530b439180f1e9c682c2a2f53088ef677daab33 Mon Sep 17 00:00:00 2001 From: Kurtis Rader Date: Sun, 25 Nov 2018 19:51:13 -0800 Subject: [PATCH] Eliminate use of two obsolete preprocessor symbols Resolves #1018 --- src/cmd/ksh93/edit/edit.c | 12 ------------ src/cmd/ksh93/edit/emacs.c | 6 ------ 2 files changed, 18 deletions(-) diff --git a/src/cmd/ksh93/edit/edit.c b/src/cmd/ksh93/edit/edit.c index 89ba117d2225..826a615d6201 100644 --- a/src/cmd/ksh93/edit/edit.c +++ b/src/cmd/ksh93/edit/edit.c @@ -196,13 +196,8 @@ int tty_raw(int fd, int echomode) { ttyparm.c_lflag &= ~FLUSHO; #endif // FLUSHO nttyparm = ttyparm; -#ifndef u370 nttyparm.c_iflag &= ~(IGNPAR | PARMRK | INLCR | IGNCR | ICRNL); nttyparm.c_iflag |= BRKINT; -#else // u370 - nttyparm.c_iflag &= ~(IGNBRK | PARMRK | INLCR | IGNCR | ICRNL | INPCK); - nttyparm.c_iflag |= (BRKINT | IGNPAR); -#endif // u370 if (echo) { nttyparm.c_lflag &= ~(ICANON); } else { @@ -291,14 +286,7 @@ void ed_ringbell(void) { write(ERRIO, bellchr, 1); } // // Send a carriage return line feed to the terminal. // - void ed_crlf(Edit_t *ep) { -#ifdef cray - ed_putchar(ep, '\r'); -#endif // cray -#ifdef u370 - ed_putchar(ep, '\r'); -#endif // u370 ed_putchar(ep, '\n'); ed_flush(ep); } diff --git a/src/cmd/ksh93/edit/emacs.c b/src/cmd/ksh93/edit/emacs.c index f886b7213ddf..ba0214e545e1 100644 --- a/src/cmd/ksh93/edit/emacs.c +++ b/src/cmd/ksh93/edit/emacs.c @@ -268,12 +268,6 @@ int ed_emacsread(void *context, int fd, char *buff, int scend, int reedit) { tty_cooked(ERRIO); return 0; } -#ifdef u370 - case cntl('S'): - case cntl('Q'): { - continue; - } -#endif // u370 case '\t': { if ((cur > 0 || ep->ed->e_tabcount) && ep->ed->sh->nextprompt) { if (ep->ed->e_tabcount == 0) {