X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=test%2Ftest.priv.h;h=3b88de13be59b93fa442e45ae9e6f0e22b776624;hb=1f7a36fe16b11bb4aab51be89bbc1b0f75936b78;hp=f0b660f434ce78c4cda936d3c5b1f7107eeb3671;hpb=47d2fb4537d9ad5bb14f4810561a327930ca4280;p=ncurses.git

diff --git a/test/test.priv.h b/test/test.priv.h
index f0b660f4..3b88de13 100644
--- a/test/test.priv.h
+++ b/test/test.priv.h
@@ -30,7 +30,7 @@
 /****************************************************************************
  *  Author: Thomas E. Dickey                    1996-on                     *
  ****************************************************************************/
-/* $Id: test.priv.h,v 1.185 2020/02/02 23:34:34 tom Exp $ */
+/* $Id: test.priv.h,v 1.190 2020/08/29 21:08:12 tom Exp $ */
 
 #ifndef __TEST_PRIV_H
 #define __TEST_PRIV_H 1
@@ -391,6 +391,10 @@
 #include <curses.h>
 #endif
 
+#if !(defined(NCURSES_WGETCH_EVENTS) && defined(NEED_KEY_EVENT))
+#undef KEY_EVENT		/* reduce compiler-warnings with Visual C++ */
+#endif
+
 #if defined(HAVE_XCURSES) || defined(PDCURSES)
 /* no other headers */
 #undef  HAVE_SETUPTERM		/* nonfunctional */
@@ -437,6 +441,13 @@ extern int optind;
 #include <assert.h>
 #include <ctype.h>
 
+#if defined(_MSC_VER)
+#undef popen
+#define popen(s,n) _popen(s,n)
+#undef pclose
+#define pclose(s) _pclose(s)
+#endif
+
 #ifndef GCC_NORETURN
 #define GCC_NORETURN		/* nothing */
 #endif
@@ -903,7 +914,7 @@ extern int TABSIZE;
 
 #if defined(NCURSES_VERSION) && HAVE_NC_ALLOC_H
 #include <nc_alloc.h>
-#if HAVE_NC_FREEALL && defined(USE_TINFO)
+#if HAVE_EXIT_TERMINFO && defined(USE_TINFO)
 #undef ExitProgram
 #define ExitProgram(code) exit_terminfo(code)
 #endif
@@ -924,8 +935,12 @@ extern int TABSIZE;
 #define EXIT_FAILURE 1
 #endif
 
-#if defined(_WIN32) || defined(USE_WIN32CON_DRIVER)
+#undef _NC_WINDOWS
+#if (defined(_WIN32) || defined(_WIN64))
+#define _NC_WINDOWS 1
+#endif
 
+#if defined(_NC_WINDOWS) || defined(USE_WIN32CON_DRIVER)
 #if defined(PDCURSES)
 #ifdef WINVER
 #  if WINVER < 0x0501
@@ -942,6 +957,9 @@ extern int TABSIZE;
 #define SIGKILL 9
 #define getlogin() "username"
 
+#elif defined(EXP_WIN32_DRIVER)
+/* ignore the mingw headers */
+
 #elif defined(HAVE_NCURSESW_NCURSES_H)
 #include <ncursesw/nc_mingw.h>
 #elif defined(HAVE_NCURSES_NCURSES_H)
@@ -1022,6 +1040,12 @@ extern char *_nc_strstr(const char *, const char *);
 #define InitAndCatch(init,handler) do { init; CATCHALL(handler); } while (0)
 #endif
 
+#if defined(_NC_WINDOWS) || defined(USE_WIN32CON_DRIVER)
+#define SetupAlarm(opt)	(void)opt
+#else
+#define SetupAlarm(opt)	if (opt) alarm((unsigned)opt)
+#endif
+
 /*
  * Workaround for clean(er) compile with Solaris's legacy curses.
  * The same would be needed for HPUX 10.20