/****************************************************************************
- * 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 *
/****************************************************************************
* 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.169 2018/08/19 00:28:27 tom Exp $ */
#ifndef __TEST_PRIV_H
#define __TEST_PRIV_H 1
#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
#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
#define EXIT_FAILURE 1
#endif
-#if defined(__MINGW32__) || defined(USE_WIN32CON_DRIVER)
+#if defined(_WIN32) || defined(USE_WIN32CON_DRIVER)
#if defined(PDCURSES)
#ifdef WINVER
*/
#ifndef NCURSES_CONST
#ifdef PDCURSES
-#define NCURSES_CONST const /* close enough */
+#define NCURSES_CONST const /* close enough */
#else
#define NCURSES_CONST /* nothing */
#endif
#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_WINDOW(w,func) func(w, NULL)
+#define USING_WINDOW1(w,func,safe) func(w)
#define USING_WINDOW2(w,func,data) func(w,data)
#define WANT_USE_WINDOW() extern void _nc_want_use_window(void)
#endif