diff options
| author | Xin LI <delphij@FreeBSD.org> | 2014-02-28 19:12:44 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2014-02-28 19:12:44 +0000 |
| commit | 4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a (patch) | |
| tree | b8f6e12b479a78216f3bffb8e1258d54087268de /ncurses/base/lib_bkgd.c | |
| parent | e07762606a5bf651a501cb095c98cba90e4a8fe2 (diff) | |
| download | src-4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a.tar.gz src-4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a.zip | |
Undo two previous imports which was never done in preparation of doing a
new import.
Notes
Notes:
svn path=/vendor/ncurses/dist/; revision=262616
Diffstat (limited to 'ncurses/base/lib_bkgd.c')
| -rw-r--r-- | ncurses/base/lib_bkgd.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ncurses/base/lib_bkgd.c b/ncurses/base/lib_bkgd.c index 0396ba8f47a8..c99e0c5fc3a8 100644 --- a/ncurses/base/lib_bkgd.c +++ b/ncurses/base/lib_bkgd.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -36,7 +36,7 @@ #include <curses.priv.h> -MODULE_ID("$Id: lib_bkgd.c,v 1.43 2011/01/22 19:47:37 tom Exp $") +MODULE_ID("$Id: lib_bkgd.c,v 1.36 2008/03/23 00:09:14 tom Exp $") /* * Set the window's background information. @@ -48,7 +48,7 @@ static NCURSES_INLINE void #endif wbkgrndset(WINDOW *win, const ARG_CH_T ch) { - T((T_CALLED("wbkgdset(%p,%s)"), (void *) win, _tracech_t(ch))); + T((T_CALLED("wbkgdset(%p,%s)"), win, _tracech_t(ch))); if (win) { attr_t off = AttrOf(win->_nc_bkgd); @@ -85,12 +85,12 @@ wbkgrndset(WINDOW *win, const ARG_CH_T ch) cchar_t wch; int tmp; - (void) wgetbkgrnd(win, &wch); + wgetbkgrnd(win, &wch); tmp = _nc_to_char((wint_t) CharOf(wch)); win->_bkgd = (((tmp == EOF) ? ' ' : (chtype) tmp) | (AttrOf(wch) & ALL_BUT_COLOR) - | (chtype) ColorPair(GET_WINDOW_PAIR(win))); + | COLOR_PAIR(GET_WINDOW_PAIR(win))); } #endif } @@ -120,14 +120,14 @@ wbkgrnd(WINDOW *win, const ARG_CH_T ch) int x, y; NCURSES_CH_T new_bkgd = CHDEREF(ch); - T((T_CALLED("wbkgd(%p,%s)"), (void *) win, _tracech_t(ch))); + T((T_CALLED("wbkgd(%p,%s)"), win, _tracech_t(ch))); if (win) { NCURSES_CH_T old_bkgrnd; wgetbkgrnd(win, &old_bkgrnd); - (void) wbkgrndset(win, CHREF(new_bkgd)); - (void) wattrset(win, AttrOf(win->_nc_bkgd)); + wbkgrndset(win, CHREF(new_bkgd)); + wattrset(win, AttrOf(win->_nc_bkgd)); for (y = 0; y <= win->_maxy; y++) { for (x = 0; x <= win->_maxx; x++) { |