ncurses 6.2 - patch 20200829

[ncurses.git] / test / test.priv.h

diff --git a/test/test.priv.h b/test/test.priv.h
index 9b80f849ad408b425cf3791eb20b29a575504ec6..3b88de13be59b93fa442e45ae9e6f0e22b776624 100644 (file)
--- 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.189 2020/08/01 16:55:28 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
@@ -935,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
@@ -953,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)
@@ -1033,7 +1040,7 @@ extern char *_nc_strstr(const char *, const char *);
 #define InitAndCatch(init,handler) do { init; CATCHALL(handler); } while (0)
 #endif
 
-#if defined(_WIN32) || defined(USE_WIN32CON_DRIVER)
+#if defined(_NC_WINDOWS) || defined(USE_WIN32CON_DRIVER)
 #define SetupAlarm(opt)        (void)opt
 #else
 #define SetupAlarm(opt)        if (opt) alarm((unsigned)opt)