X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ftest.priv.h;h=ac60ac156bbaf5d0ef3b3b300e34bd18a18be671;hp=f0a68c2e5bb6ee152537e69aed1efef9b453860c;hb=8556933f52df71cf1b58eeaeae1865ebf7c005cc;hpb=b0bdfbb1c78346047c54d8e516a104fcff586e52

diff --git a/test/test.priv.h b/test/test.priv.h
index f0a68c2e..ac60ac15 100644
--- a/test/test.priv.h
+++ b/test/test.priv.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -29,7 +29,7 @@
 /****************************************************************************
  *  Author: Thomas E. Dickey                    1996-on                     *
  ****************************************************************************/
-/* $Id: test.priv.h,v 1.162 2017/12/26 22:20:42 tom Exp $ */
+/* $Id: test.priv.h,v 1.165 2018/05/20 19:55:18 tom Exp $ */
 
 #ifndef __TEST_PRIV_H
 #define __TEST_PRIV_H 1
@@ -442,6 +442,9 @@ extern int optind;
 #ifndef GCC_PRINTFLIKE
 #define GCC_PRINTFLIKE(a,b)	/* nothing */
 #endif
+#ifndef GCC_SCANFLIKE
+#define GCC_SCANFLIKE(a,b)	/* nothing */
+#endif
 #ifndef GCC_UNUSED
 #define GCC_UNUSED		/* nothing */
 #endif
@@ -611,9 +614,17 @@ extern int optind;
 
 #ifndef WA_NORMAL
 #define WA_NORMAL       A_NORMAL
+#endif
+#ifndef WA_BOLD
 #define WA_BOLD         A_BOLD
+#endif
+#ifndef WA_REVERSE
 #define WA_REVERSE      A_REVERSE
+#endif
+#ifndef WA_UNDERLINE
 #define WA_UNDERLINE    A_UNDERLINE
+#endif
+#ifndef WA_BLINK
 #define WA_BLINK        A_BLINK
 #endif
 
@@ -892,7 +903,7 @@ extern char *strnames[], *strcodes[], *strfnames[];
  */
 #ifndef NCURSES_CONST
 #ifdef PDCURSES
-#define NCURSES_CONST		const /* close enough */
+#define NCURSES_CONST		const	/* close enough */
 #else
 #define NCURSES_CONST		/* nothing */
 #endif
@@ -994,10 +1005,12 @@ extern char *tgoto(char *, int, int);	/* available, but not prototyped */
 
 #if HAVE_USE_WINDOW
 #define USING_WINDOW(w,func) use_window(w, (NCURSES_WINDOW_CB) func, w)
+#define USING_WINDOW1(w,func,safe) use_window(w, (NCURSES_WINDOW_CB) safe, NULL)
 #define USING_WINDOW2(w,func,data) use_window(w, (NCURSES_WINDOW_CB) func, data)
 #define WANT_USE_WINDOW() extern void _nc_want_use_window(void)
 #else
 #define USING_WINDOW(w,func) func(w)
+#define USING_WINDOW1(w,func,safe) func(w,func)
 #define USING_WINDOW2(w,func,data) func(w,data)
 #define WANT_USE_WINDOW() extern void _nc_want_use_window(void)
 #endif