X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ftest.priv.h;h=74f1077d0cd91f7ad9b2af7c433f5623b60f2a2c;hp=864424b99d9174a809acded10c2c49bd8c09e049;hb=e2e9c09c48b19b24979cafb2d4864f538b5ddd1c;hpb=11dcb05d1b3076f114ee807bd68cee1cfadff7dc diff --git a/test/test.priv.h b/test/test.priv.h index 864424b9..74f1077d 100644 --- a/test/test.priv.h +++ b/test/test.priv.h @@ -29,7 +29,7 @@ /**************************************************************************** * Author: Thomas E. Dickey 1996-on * ****************************************************************************/ -/* $Id: test.priv.h,v 1.132 2016/04/09 23:55:01 tom Exp $ */ +/* $Id: test.priv.h,v 1.138 2016/09/10 23:42:33 tom Exp $ */ #ifndef __TEST_PRIV_H #define __TEST_PRIV_H 1 @@ -62,6 +62,9 @@ #define HAVE_ASSUME_DEFAULT_COLORS 0 #endif +#ifndef HAVE_BSD_STRING_H +#define HAVE_BSD_STRING_H 0 +#endif #ifndef HAVE_CURSES_VERSION #define HAVE_CURSES_VERSION 0 #endif @@ -162,6 +165,10 @@ #define HAVE_RESIZE_TERM 0 #endif +#ifndef HAVE_RESTARTTERM +#define HAVE_RESTARTTERM 0 +#endif + #ifndef HAVE_RIPOFFLINE #define HAVE_RIPOFFLINE 0 #endif @@ -543,12 +550,67 @@ extern int optind; #define KEY_MIN 256 /* not defined in Solaris 8 */ #endif +/* from nc_string.h, to make this stand alone */ +#if HAVE_BSD_STRING_H +#include +#endif + +#ifdef __cplusplus +#define NCURSES_VOID /* nothing */ +#else +#define NCURSES_VOID (void) +#endif + +#ifndef HAVE_STRLCAT +#define HAVE_STRLCAT 0 +#endif + +#ifndef HAVE_STRLCPY +#define HAVE_STRLCPY 0 +#endif + +#ifndef HAVE_SNPRINTF +#define HAVE_SNPRINTF 0 +#endif + +#ifndef USE_STRING_HACKS +#define USE_STRING_HACKS 0 +#endif + +#if USE_STRING_HACKS && HAVE_STRLCAT +#define _nc_STRCAT(d,s,n) NCURSES_VOID strlcat((d),(s),NCURSES_CAST(size_t,n)) +#define _nc_STRNCAT(d,s,m,n) NCURSES_VOID strlcat((d),(s),NCURSES_CAST(size_t,m)) +#else +#define _nc_STRCAT(d,s,n) NCURSES_VOID strcat((d),(s)) +#define _nc_STRNCAT(d,s,m,n) NCURSES_VOID strncat((d),(s),(n)) +#endif + +#if USE_STRING_HACKS && HAVE_STRLCPY +#define _nc_STRCPY(d,s,n) NCURSES_VOID strlcpy((d),(s),NCURSES_CAST(size_t,n)) +#define _nc_STRNCPY(d,s,n) NCURSES_VOID strlcpy((d),(s),NCURSES_CAST(size_t,n)) +#else +#define _nc_STRCPY(d,s,n) NCURSES_VOID strcpy((d),(s)) +#define _nc_STRNCPY(d,s,n) NCURSES_VOID strncpy((d),(s),(n)) +#endif + +#if USE_STRING_HACKS && HAVE_SNPRINTF +#define _nc_SPRINTF NCURSES_VOID snprintf +#define _nc_SLIMIT(n) NCURSES_CAST(size_t,n), +#else +#define _nc_SPRINTF NCURSES_VOID sprintf +#define _nc_SLIMIT(n) /* nothing */ +#endif + #ifdef DECL_CURSES_DATA_BOOLNAMES extern char *boolnames[], *boolcodes[], *boolfnames[]; extern char *numnames[], *numcodes[], *numfnames[]; extern char *strnames[], *strcodes[], *strfnames[]; #endif +#ifdef DECL_CURSES_DATA_TTYTYPE +#define ttytype termname() +#endif + #define colored_chtype(ch, attr, pair) \ ((chtype) (ch) | (chtype) (attr) | (chtype) COLOR_PAIR(pair))