X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ftest.priv.h;h=eedf201b6a6f694475d30d2ae7be59f77624baad;hp=4b22b748eccdf191427bbbf312dc0971bd9ea791;hb=02f02dcd4464143580e783ae32c822d8eb8cdcbf;hpb=73b54c0812e4b8dfddcf87f59c7488bb3c10e10d diff --git a/test/test.priv.h b/test/test.priv.h index 4b22b748..eedf201b 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.128 2014/08/02 23:40:53 tom Exp $ */ +/* $Id: test.priv.h,v 1.131 2014/10/25 01:20:34 tom Exp $ */ #ifndef __TEST_PRIV_H #define __TEST_PRIV_H 1 @@ -230,6 +230,10 @@ #define HAVE_USE_ENV 0 #endif +#ifndef HAVE_USE_EXTENDED_NAMES +#define HAVE_USE_EXTENDED_NAMES 0 +#endif + #ifndef HAVE_USE_SCREEN #define HAVE_USE_SCREEN 0 #endif @@ -663,9 +667,9 @@ extern char *strnames[], *strcodes[], *strfnames[]; #define ExitProgram(code) _nc_free_tinfo(code) #endif #else -#define typeMalloc(type,n) (type *) malloc((n) * sizeof(type)) -#define typeCalloc(type,elts) (type *) calloc((elts), sizeof(type)) -#define typeRealloc(type,n,p) (type *) realloc(p, (n) * sizeof(type)) +#define typeMalloc(type,n) (type *) malloc((size_t)(n) * sizeof(type)) +#define typeCalloc(type,elts) (type *) calloc((size_t)(elts), sizeof(type)) +#define typeRealloc(type,n,p) (type *) realloc(p, (size_t)(n) * sizeof(type)) #endif #ifndef ExitProgram @@ -679,7 +683,7 @@ extern char *strnames[], *strcodes[], *strfnames[]; #define EXIT_FAILURE 1 #endif -#if defined(__MINGW32__) +#if defined(__MINGW32__) || defined(USE_WIN32CON_DRIVER) #if defined(PDCURSES) #ifdef WINVER