ncurses 5.6 - patch 20080209

[ncurses.git] / test / movewindow.c

diff --git a/test/movewindow.c b/test/movewindow.c
index e102b66718007c0e00bad36bf811203b06b7a1d7..a45121db91d6e732969a902868cee1874414f672 100644 (file)
--- a/test/movewindow.c
+++ b/test/movewindow.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2006,2007 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2006-2007,2008 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            *
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: movewindow.c,v 1.20 2007/01/06 23:28:53 tom Exp $
+ * $Id: movewindow.c,v 1.21 2008/02/09 18:08:28 tom Exp $
  *
  * Demonstrate move functions for windows and derived windows from the curses
  * library.
@@ -47,6 +47,12 @@ mvwin
 #undef derwin
 #endif
 
+#ifdef NCURSES_VERSION
+#define CONST_FMT const
+#else
+#define CONST_FMT              /* nothing */
+#endif
+
 #undef LINE_MAX
 
 #define LINE_MIN       2
@@ -63,14 +69,14 @@ typedef struct {
     WINDOW *child;             /* the actual value */
 } FRAME;
 
-static void head_line(const char *fmt,...) GCC_PRINTFLIKE(1, 2);
-static void tail_line(const char *fmt,...) GCC_PRINTFLIKE(1, 2);
+static void head_line(CONST_FMT char *fmt,...) GCC_PRINTFLIKE(1, 2);
+static void tail_line(CONST_FMT char *fmt,...) GCC_PRINTFLIKE(1, 2);
 
 static unsigned num_windows;
 static FRAME *all_windows;
 
 static void
-message(int lineno, const char *fmt, va_list argp)
+message(int lineno, CONST_FMT char *fmt, va_list argp)
 {
     int y, x;
 
@@ -93,7 +99,7 @@ message(int lineno, const char *fmt, va_list argp)
 }
 
 static void
-head_line(const char *fmt,...)
+head_line(CONST_FMT char *fmt,...)
 {
     va_list argp;
 
@@ -103,7 +109,7 @@ head_line(const char *fmt,...)
 }
 
 static void
-tail_line(const char *fmt,...)
+tail_line(CONST_FMT char *fmt,...)
 {
     va_list argp;
 
@@ -511,7 +517,7 @@ show_help(WINDOW *current)
     /* *INDENT-OFF* */
     static struct {
        int     key;
-       const char * msg;
+       CONST_FMT char * msg;
     } help[] = {
        { '?',          "Show this screen" },
        { 'b',          "Draw a box inside the current window" },