X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fcurses.priv.h;h=1390221e90e9152e74445931f877de4188dea50c;hp=e85828e64971ae502ead291996df303b2f31bed6;hb=2b7c2fd2f9d58719770902ce4d0d0aeb87b284f7;hpb=2a3e5b0949f9eca0620d2548488cf81904ad3c83

diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index e85828e6..1390221e 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.634 2020/08/29 20:11:24 tom Exp $
+ * $Id: curses.priv.h,v 1.636 2020/09/06 20:53:41 tom Exp $
  *
  *	curses.priv.h
  *
@@ -297,12 +297,11 @@ extern NCURSES_EXPORT(void *) _nc_memmove (void *, const void *, size_t);
 #define NO_TERMINAL 0
 #endif
 
-#define CHECK_TERM_ENV(env, isNull, NOTERM) \
-	(isNull = ((env == 0) || (*env == 0)), \
-	 (env = (isNull \
-		 ? NOTERM \
-		 : env), \
-		(isNull = ((env == 0) || (*env == 0)))))
+#define CHECK_TERM_ENV(term_env, no_terminal) \
+	(term_env = (NonEmpty(term_env) \
+		     ? term_env \
+		     : no_terminal), \
+	 !NonEmpty(term_env))
 
 /*
  * Note:  ht/cbt expansion flakes out randomly under Linux 1.1.47, but only