X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fncurses.c;h=48219f4d07d9d767ddb05475154fea38f33d2e64;hp=c1790c8924901d0e072cfd69aaaf292b4ba10eed;hb=82a087c4c47679fcfa59bb6d7bdbe587355ba3f6;hpb=027ae42953e3186daed8f3882da73de48291b606

diff --git a/test/ncurses.c b/test/ncurses.c
index c1790c89..48219f4d 100644
--- a/test/ncurses.c
+++ b/test/ncurses.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2006,2007 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            *
@@ -40,7 +40,7 @@ AUTHOR
    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
            Thomas E. Dickey (beginning revision 1.27 in 1996).
 
-$Id: ncurses.c,v 1.280 2006/12/10 00:13:15 tom Exp $
+$Id: ncurses.c,v 1.282 2007/03/03 21:26:24 tom Exp $
 
 ***************************************************************************/
 
@@ -3124,7 +3124,7 @@ show_utf8_chars(attr_t attr, short pair)
 /* *INDENT-OFF* */
 static struct {
     attr_t attr;
-    char *name;
+    const char *name;
 } attrs_to_cycle[] = {
     { A_NORMAL,		"normal" },
     { A_BOLD,		"bold" },
@@ -3379,7 +3379,7 @@ FRAME
     WINDOW *wind;
 };
 
-#ifdef NCURSES_VERSION
+#if defined(NCURSES_VERSION) && !NCURSES_OPAQUE
 #define keypad_active(win) (win)->_use_keypad
 #define scroll_active(win) (win)->_scroll
 #else