X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fcurses.priv.h;h=0804b0b9a35682196a3e939ffd87dbdbfb27002d;hp=67a85920e268bbf4ece12953156338d3843f251e;hb=d7e4a265b50f6fddbad20ea238fdc05a35cbdc2f;hpb=d129a54c07c01d853ead291e5bef7fe978094f2d

diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 67a85920..0804b0b9 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -34,7 +34,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.537 2014/05/03 21:20:12 tom Exp $
+ * $Id: curses.priv.h,v 1.539 2014/09/04 22:52:07 tom Exp $
  *
  *	curses.priv.h
  *
@@ -314,7 +314,7 @@ typedef TRIES {
 #undef _XOPEN_SOURCE_EXTENDED
 #undef _XPG5
 #define _nc_bkgd    _bkgd
-#define wgetbkgrnd(win, wch)	*wch = win->_bkgd
+#define wgetbkgrnd(win, wch)	((*wch = win->_bkgd) != 0 ? OK : ERR)
 #define wbkgrnd	    wbkgd
 #endif
 
@@ -1458,11 +1458,11 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
 				AttrOf(dst) |= (attr_t) (ext + 1)
 
 #define if_WIDEC(code)  code
-#define Charable(ch)	((SP_PARM->_legacy_coding)			\
+#define Charable(ch)	(((SP_PARM->_legacy_coding)			\
 			 || (AttrOf(ch) & A_ALTCHARSET)			\
-			 || (!isWidecExt(ch) &&				\
+			 || (!isWidecExt(ch))) &&			\
 			     (ch).chars[1] == L'\0' &&			\
-			     _nc_is_charable(CharOf(ch))))
+			     _nc_is_charable(CharOf(ch)))
 
 #define L(ch)		L ## ch
 #else /* }{ */