ncurses 6.2 - patch 20200926

[ncurses.git] / include / nc_win32.h

diff --git a/include/nc_win32.h b/include/nc_win32.h
index 8fa3986981c6dd12786322e4cbc25fe08d6d56c1..790e8dfe9388153dcefe17f7fd392f58862c88f7 100644 (file)
--- a/include/nc_win32.h
+++ b/include/nc_win32.h
@@ -31,7 +31,7 @@
  * Author: Thomas Dickey, 2008-on                                           *
  ****************************************************************************/
 
-/* $Id: nc_win32.h,v 1.7 2020/09/06 20:53:55 tom Exp $ */
+/* $Id: nc_win32.h,v 1.9 2020/09/13 00:17:30 tom Exp $ */
 
 #ifndef NC_WIN32_H
 #define NC_WIN32_H 1
@@ -87,6 +87,8 @@ extern NCURSES_EXPORT(int) _nc_gettimeofday(struct timeval *, void *);
 #define wcwidth(ucs)  _nc_wcwidth((wchar_t)(ucs))
 extern NCURSES_EXPORT(int)    _nc_wcwidth(wchar_t);
 
+#ifdef EVENTLIST_2nd /* test.priv.h just needs the preceding */
+
 extern NCURSES_EXPORT(void)   _nc_console_size(int* Lines, int* Cols);
 extern NCURSES_EXPORT(HANDLE) _nc_console_handle(int fd);
 extern NCURSES_EXPORT(int)    _nc_console_isatty(int fd);
@@ -107,15 +109,15 @@ extern NCURSES_EXPORT(int)    _nc_console_vt_supported(void);
 extern NCURSES_EXPORT(int)    _nc_console_checkmintty(int fd, LPHANDLE pMinTTY);
 #endif
 
-#undef CHECK_TERM_ENV
+#undef VALID_TERM_ENV
 #define MS_TERMINAL "ms-terminal"
-#define CHECK_TERM_ENV(term_env, no_terminal) \
+#define VALID_TERM_ENV(term_env, no_terminal) \
        (term_env = (NonEmpty(term_env) \
                      ? term_env \
                      : (_nc_console_vt_supported() \
                         ? MS_TERMINAL \
                         : no_terminal)), \
-        !NonEmpty(term_env))
+        NonEmpty(term_env))
 
   /*
    * Various Console mode definitions
@@ -170,6 +172,8 @@ extern NCURSES_EXPORT_VAR(ConsoleInfo) _nc_CONSOLE;
 
 #define TypeAlloca(type,count)(type*) _alloca(sizeof(type)*(size_t)(count))
 
+#endif /* EVENTLIST_2nd */
+
 #ifdef __cplusplus
 }
 #endif