X-Git-Url: http://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=ncurses%2Fcurses.priv.h;h=752110a6027f87af06bc28e0044302f062f416d9;hb=89407f55b3f245bea3a8884c074940cd325ec3da;hp=836189e04b1a92ca909b399205eab5082355823a;hpb=67ab4b308e932639a3a832052228d445c41c54b4;p=ncurses.git

diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 836189e0..752110a6 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -34,7 +34,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.528 2013/10/28 00:02:27 tom Exp $
+ * $Id: curses.priv.h,v 1.529 2013/11/16 19:44:28 tom Exp $
  *
  *	curses.priv.h
  *
@@ -2344,12 +2344,13 @@ extern NCURSES_EXPORT_VAR(TERM_DRIVER) _nc_TINFO_DRIVER;
 #endif
 
 #ifdef USE_TERM_DRIVER
-#define IsTermInfo(sp)       (TCBOf(sp) && ((TCBOf(sp)->drv->isTerminfo)))
+#define IsTermInfo(sp)       ((TCBOf(sp) != 0) && ((TCBOf(sp)->drv->isTerminfo)))
+#define HasTInfoTerminal(sp) ((0 != TerminalOf(sp)) && IsTermInfo(sp))
 #else
 #define IsTermInfo(sp)       TRUE
+#define HasTInfoTerminal(sp) (0 != TerminalOf(sp))
 #endif
 
-#define HasTInfoTerminal(sp) ((0 != TerminalOf(sp)) && IsTermInfo(sp))
 #define IsValidTIScreen(sp)  (HasTInfoTerminal(sp))
 
 /*