X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ftest.priv.h;h=f4c11aa5506791777c71c8c1fdc84c5f29a030db;hp=ac60ac156bbaf5d0ef3b3b300e34bd18a18be671;hb=22a4b929f47f85588dc07fddf98b09776cec658f;hpb=0237f10a296593d54fd8b2aa144921983085e002 diff --git a/test/test.priv.h b/test/test.priv.h index ac60ac15..f4c11aa5 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.165 2018/05/20 19:55:18 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 @@ -865,7 +865,7 @@ extern char *strnames[], *strcodes[], *strfnames[]; #define EXIT_FAILURE 1 #endif -#if defined(__MINGW32__) || defined(USE_WIN32CON_DRIVER) +#if defined(_WIN32) || defined(USE_WIN32CON_DRIVER) #if defined(PDCURSES) #ifdef WINVER @@ -1009,8 +1009,8 @@ extern char *tgoto(char *, int, int); /* available, but not prototyped */ #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_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