/****************************************************************************
* Author: Thomas E. Dickey 1996-on *
****************************************************************************/
-/* $Id: test.priv.h,v 1.125 2014/07/19 23:06:27 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
#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
#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
#define EXIT_FAILURE 1
#endif
-#if defined(__MINGW32__)
+#if defined(__MINGW32__) || defined(USE_WIN32CON_DRIVER)
#if defined(PDCURSES)
#ifdef WINVER
#define MvVLine (void) mvvline
#define MvWVLine (void) mvwvline
+/*
+ * The macro likely uses unsigned values, while X/Open prototype uses int.
+ */
+#if defined(wattrset) || defined(PDCURSES)
+#define AttrArg(p,a) (attr_t) ((attr_t)(p) | (attr_t)(a))
+#else
+#define AttrArg(p,a) (int) ((attr_t)(p) | (attr_t)(a))
+#endif
+
/*
* Workaround for defective implementation of gcc attribute warn_unused_result
*/