diff options
| author | jdc <jdc@NetBSD.org> | 2007-09-19 22:00:43 +0000 |
|---|---|---|
| committer | jdc <jdc@NetBSD.org> | 2007-09-19 22:00:43 +0000 |
| commit | 260ad27047779cda35b4eae10ae80a697f4e2bb4 (patch) | |
| tree | a87bfb5c39bab7a786a60f63a7578047aeabc99f /lib/libcurses/refresh.c | |
| parent | c1726648035cf4592e4792f06595905a0bb1c7aa (diff) | |
We don't need separate #ifdef's for __ALTCHARSET and WA_ALTCHARSET, as they
are defined to be the same in curses.h.
Diffstat (limited to 'lib/libcurses/refresh.c')
| -rw-r--r-- | lib/libcurses/refresh.c | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/lib/libcurses/refresh.c b/lib/libcurses/refresh.c index ea83f00d3b3..355f28f3e5b 100644 --- a/lib/libcurses/refresh.c +++ b/lib/libcurses/refresh.c @@ -1,4 +1,4 @@ -/* $NetBSD: refresh.c,v 1.67 2007/05/29 19:07:19 veego Exp $ */ +/* $NetBSD: refresh.c,v 1.68 2007/09/19 22:00:43 jdc Exp $ */ /* * Copyright (c) 1981, 1993, 1994 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)refresh.c 8.7 (Berkeley) 8/13/94"; #else -__RCSID("$NetBSD: refresh.c,v 1.67 2007/05/29 19:07:19 veego Exp $"); +__RCSID("$NetBSD: refresh.c,v 1.68 2007/09/19 22:00:43 jdc Exp $"); #endif #endif /* not lint */ @@ -905,17 +905,10 @@ makech(int wy) off &= __mask_se; } -#ifndef HAVE_WCHAR if (off & __ALTCHARSET && __tc_ae != NULL) { tputs(__tc_ae, 0, __cputchar); curscr->wattr &= ~__ALTCHARSET; } -#else - if (off & WA_ALTCHARSET && __tc_ae != NULL) { - tputs(__tc_ae, 0, __cputchar); - curscr->wattr &= ~WA_ALTCHARSET; - } -#endif /* HAVE_WCHAR */ /* Set/change colour as appropriate. */ if (__using_color) @@ -1000,19 +993,11 @@ makech(int wy) } /* Enter/exit altcharset mode as appropriate. */ -#ifndef HAVE_WCHAR if (on & __ALTCHARSET && __tc_as != NULL && __tc_ae != NULL) { tputs(__tc_as, 0, __cputchar); curscr->wattr |= __ALTCHARSET; } -#else - if (on & WA_ALTCHARSET && __tc_as != NULL && - __tc_ae != NULL) { - tputs(__tc_as, 0, __cputchar); - curscr->wattr |= WA_ALTCHARSET; - } -#endif /* HAVE_WCHAR */ wx++; if (wx >= win->maxx && @@ -1723,17 +1708,10 @@ __unsetattr(int checkms) curscr->wattr &= __mask_me; } /* Don't leave the screen with altcharset set (don't check ms). */ -#ifndef HAVE_WCHAR if (curscr->wattr & __ALTCHARSET) { tputs(__tc_ae, 0, __cputchar); curscr->wattr &= ~__ALTCHARSET; } -#else - if (curscr->wattr & WA_ALTCHARSET) { - tputs(__tc_ae, 0, __cputchar); - curscr->wattr &= ~WA_ALTCHARSET; - } -#endif /* HAVE_WCHAR */ /* Don't leave the screen with colour set (check against ms). */ if (__using_color && isms) __unset_color(curscr); |
