diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2021-02-25 17:22:00 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2021-02-25 17:22:00 +0000 |
| commit | bf0ab54638a5ef969749f6ceae30e864f9556ea8 (patch) | |
| tree | 11690c2184e55d37bcd3c7fd13f3d0d9d20dbcb0 /test/test.priv.h | |
| parent | 72c3fc31f590566e93496732d6fa769cd353e270 (diff) | |
| download | src-vendor/ncurses.tar.gz src-vendor/ncurses.zip | |
Vendor import ncurses 6.2-20210220vendor/ncurses/6.2-20210220vendor/ncurses
Diffstat (limited to 'test/test.priv.h')
| -rw-r--r-- | test/test.priv.h | 44 |
1 files changed, 40 insertions, 4 deletions
diff --git a/test/test.priv.h b/test/test.priv.h index f0b660f434ce..6913b25d14ca 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.191 2020/09/12 23:54:42 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,7 +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 @@ -942,7 +958,19 @@ extern int TABSIZE; #define SIGKILL 9 #define getlogin() "username" -#elif defined(HAVE_NCURSESW_NCURSES_H) +#elif defined(EXP_WIN32_DRIVER) + +#if defined(HAVE_NCURSESW_NCURSES_H) +#include <ncursesw/nc_win32.h> +#elif defined(HAVE_NCURSES_NCURSES_H) +#include <ncurses/nc_win32.h> +#else +#include <nc_win32.h> +#endif + +#else + +#if defined(HAVE_NCURSESW_NCURSES_H) #include <ncursesw/nc_mingw.h> #elif defined(HAVE_NCURSES_NCURSES_H) #include <ncurses/nc_mingw.h> @@ -950,6 +978,8 @@ extern int TABSIZE; #include <nc_mingw.h> #endif +#endif + /* conflicts in test/firstlast.c */ #undef large #undef small @@ -1022,6 +1052,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 |