ncurses 5.6 - patch 20080906

[ncurses.git] / test / test.priv.h

diff --git a/test/test.priv.h b/test/test.priv.h
index d5a8b9a5d00de326eeb78f65c819b068119c3d1e..1f83dbede6cc9bfd538a41fd5af5a3413aeb4d58 100644 (file)
--- 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.75 2008/03/22 19:27:11 tom Exp $ */
+/* $Id: test.priv.h,v 1.78 2008/09/06 22:01:24 tom Exp $ */
 
 #ifndef __TEST_PRIV_H
 #define __TEST_PRIV_H 1
@@ -449,6 +449,7 @@ extern int optind;
 #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))
 #endif
 
@@ -541,11 +542,12 @@ extern char *tgoto(char *, int, int);     /* available, but not prototyped */
  */
 
 #if !HAVE_USE_WINDOW
-typedef int (*NCURSES_CALLBACK)(WINDOW *, void *);
+typedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *);
+typedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *);
 #endif
 
 #if HAVE_USE_WINDOW
-#define USING_WINDOW(w,func) use_window(w, (NCURSES_CALLBACK) func, w)
+#define USING_WINDOW(w,func) use_window(w, (NCURSES_WINDOW_CB) func, w)
 #define WANT_USE_WINDOW() extern void _nc_want_use_window(void)
 #else
 #define USING_WINDOW(w,func) func(w)
@@ -553,7 +555,7 @@ typedef int (*NCURSES_CALLBACK)(WINDOW *, void *);
 #endif
 
 #if HAVE_USE_WINDOW
-#define USING_SCREEN(s,func,data) use_screen(s, (NCURSES_CALLBACK) func, data)
+#define USING_SCREEN(s,func,data) use_screen(s, (NCURSES_SCREEN_CB) func, data)
 #define WANT_USE_SCREEN() extern void _nc_want_use_screen(void)
 #else
 #define USING_SCREEN(s,func,data) func(data)
@@ -568,4 +570,6 @@ typedef int (*NCURSES_CALLBACK)(WINDOW *, void *);
 #define USE_TRACE 0
 #endif
 
+#define init_mb(state) memset(&state, 0, sizeof(state))
+
 #endif /* __TEST_PRIV_H */