diff options
Diffstat (limited to 'contrib/ncurses/test/test.priv.h')
| -rw-r--r-- | contrib/ncurses/test/test.priv.h | 108 |
1 files changed, 101 insertions, 7 deletions
diff --git a/contrib/ncurses/test/test.priv.h b/contrib/ncurses/test/test.priv.h index f5ecf02c541c..05973d930029 100644 --- a/contrib/ncurses/test/test.priv.h +++ b/contrib/ncurses/test/test.priv.h @@ -29,7 +29,7 @@ /**************************************************************************** * Author: Thomas E. Dickey <dickey@clark.net> 1996 * ****************************************************************************/ -/* $Id: test.priv.h,v 1.20 2000/11/04 22:56:50 tom Exp $ */ +/* $Id: test.priv.h,v 1.34 2002/04/06 23:32:15 tom Exp $ */ #if HAVE_CONFIG_H #include <ncurses_cfg.h> @@ -40,14 +40,50 @@ #define HAVE_WRESIZE 0 #endif -#ifndef HAVE_NC_ALLOC_H -#define HAVE_NC_ALLOC_H 0 +#ifndef HAVE_CURSES_VERSION +#define HAVE_CURSES_VERSION 0 +#endif + +#ifndef HAVE_FORM_H +#define HAVE_FORM_H 0 +#endif + +#ifndef HAVE_LIBFORM +#define HAVE_LIBFORM 0 +#endif + +#ifndef HAVE_LIBMENU +#define HAVE_LIBMENU 0 +#endif + +#ifndef HAVE_LIBPANEL +#define HAVE_LIBPANEL 0 #endif #ifndef HAVE_LOCALE_H #define HAVE_LOCALE_H 0 #endif +#ifndef HAVE_MENU_H +#define HAVE_MENU_H 0 +#endif + +#ifndef HAVE_NAPMS +#define HAVE_NAPMS 1 +#endif + +#ifndef HAVE_NC_ALLOC_H +#define HAVE_NC_ALLOC_H 0 +#endif + +#ifndef HAVE_PANEL_H +#define HAVE_PANEL_H 0 +#endif + +#ifndef HAVE_WRESIZE +#define HAVE_WRESIZE 0 +#endif + #ifndef NCURSES_NOMACROS #define NCURSES_NOMACROS 0 #endif @@ -64,7 +100,10 @@ #include <unistd.h> #endif +#include <signal.h> /* include before curses.h to work around glibc bug */ + #include <curses.h> +#include <term.h> #if NCURSES_NOMACROS #include <nomacros.h> @@ -87,19 +126,74 @@ extern int optind; #define GCC_UNUSED /* nothing */ #endif -#define CharOf(c) ((unsigned char)(c)) +#ifndef HAVE_GETNSTR +#define getnstr(s,n) getstr(s) +#endif + +#ifndef USE_WIDEC_SUPPORT +#if defined(_XOPEN_SOURCE_EXTENDED) && defined(WACS_ULCORNER) +#define USE_WIDEC_SUPPORT 1 +#else +#define USE_WIDEC_SUPPORT 0 +#endif +#endif + +#ifndef HAVE_TYPE_ATTR_T +#if !USE_WIDEC_SUPPORT +#define attr_t long +#endif +#endif + +#ifndef NCURSES_CH_T +#if !USE_WIDEC_SUPPORT +#define NCURSES_CH_T chtype +#else +#define NCURSES_CH_T cchar_t +#endif +#endif + +#ifndef CCHARW_MAX +#define CCHARW_MAX 5 +#endif + +#ifndef KEY_MIN +#define KEY_MIN 256 /* not defined in Solaris 8 */ +#endif + +#ifndef getcurx +#define getcurx(win) ((win)?(win)->_curx:ERR) +#define getcury(win) ((win)?(win)->_cury:ERR) +#endif + +#ifndef getbegx +#define getbegx(win) ((win)?(win)->_begx:ERR) +#define getbegy(win) ((win)?(win)->_begy:ERR) +#endif + +#ifndef getmaxx +#define getmaxx(win) ((win)?((win)->_maxx + 1):ERR) +#define getmaxy(win) ((win)?((win)->_maxy + 1):ERR) +#endif + +/* ncurses implements tparm() with varargs, X/Open with a fixed-parameter list + * (which is incompatible with legacy usage, doesn't solve any problems). + */ +#define tparm3(a,b,c) tparm(a,b,c,0,0,0,0,0,0,0) +#define tparm2(a,b) tparm(a,b,0,0,0,0,0,0,0,0) + +#define UChar(c) ((unsigned char)(c)) #define SIZEOF(table) (sizeof(table)/sizeof(table[0])) #if defined(NCURSES_VERSION) && HAVE_NC_ALLOC_H #include <nc_alloc.h> #else -#define typeMalloc(type,n) (type *) malloc(n * sizeof(type)) -#define typeRealloc(type,n,p) (type *) realloc(p, n * sizeof(type)) +#define typeMalloc(type,n) (type *) malloc((n) * sizeof(type)) +#define typeRealloc(type,n,p) (type *) realloc(p, (n) * sizeof(type)) #endif #ifndef ExitProgram -#define ExitProgram(code) return code +#define ExitProgram(code) exit(code) #endif #ifndef EXIT_SUCCESS |