X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=include%2Fcurses.h.in;h=aecd7c5405d9f1ed49cf3810ccb06570282b0c63;hp=ac5a400a761d04571cc9956b92214a2b0464d862;hb=c6540b9c89dda1a6a8bd681726831e8924176504;hpb=c04d54322f7835ed42e597967d8fa5471025fcac;ds=sidebyside

diff --git a/include/curses.h.in b/include/curses.h.in
index ac5a400a..aecd7c54 100644
--- a/include/curses.h.in
+++ b/include/curses.h.in
@@ -32,7 +32,7 @@
  *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
-/* $Id: curses.h.in,v 1.208 2010/01/09 19:34:26 tom Exp $ */
+/* $Id: curses.h.in,v 1.209 2010/01/23 21:54:01 tom Exp $ */
 
 #ifndef __NCURSES_H
 #define __NCURSES_H
@@ -1103,12 +1103,16 @@ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_legacy_coding) (SCREEN*, int);
 
 #if !NCURSES_OPAQUE
 #if defined(_XOPEN_SOURCE_EXTENDED) && @NCURSES_EXT_COLORS@
-#define wattrset(win,at)	((win)->_color = PAIR_NUMBER(at), \
-                                 (win)->_attrs = (at), \
-                                 NCURSES_CAST(int, (win)->_attrs))
+#define wattrset(win,at)	((win) \
+				  ? ((win)->_color = PAIR_NUMBER(at), \
+                                     (win)->_attrs = (at), \
+                                     OK) \
+				  : ERR)
 #else
-#define wattrset(win,at)        ((win)->_attrs = (at), \
-				 NCURSES_CAST(int, (win)->_attrs))
+#define wattrset(win,at)        ((win) \
+				  ? ((win)->_attrs = (at), \
+				     OK) \
+				  : ERR)
 #endif
 #endif /* NCURSES_OPAQUE */