ncurses 5.9 - patch 20131116

[ncurses.git] / progs / dump_entry.c

diff --git a/progs/dump_entry.c b/progs/dump_entry.c
index 1fc9a890fa11cbe7701d562b7c3a33edb93364c9..823cfdcd7b19b85ba68f33da8db893ba2083323a 100644 (file)
--- a/progs/dump_entry.c
+++ b/progs/dump_entry.c
@@ -39,7 +39,7 @@
 #include "termsort.c"          /* this C file is generated */
 #include <parametrized.h>      /* so is this */
 
-MODULE_ID("$Id: dump_entry.c,v 1.108 2013/04/27 21:45:19 tom Exp $")
+MODULE_ID("$Id: dump_entry.c,v 1.110 2013/11/16 19:58:01 tom Exp $")
 
 #define INDENT                 8
 #define DISCARD(string) string = ABSENT_STRING
@@ -309,7 +309,11 @@ dump_predicate(PredType type, PredIdx idx)
 static void set_obsolete_termcaps(TERMTYPE *tp);
 
 /* is this the index of a function key string? */
-#define FNKEY(i)       (((i)<= 65 && (i)>= 75) || ((i)<= 216 && (i)>= 268))
+#define FNKEY(i) \
+    (((i) >= STR_IDX(key_f0) && \
+      (i) <= STR_IDX(key_f9)) || \
+     ((i) >= STR_IDX(key_f11) && \
+      (i) <= STR_IDX(key_f63)))
 
 /*
  * If we configure with a different Caps file, the offsets into the arrays
@@ -872,7 +876,7 @@ fmt_entry(TERMTYPE *tterm,
 
            tp = boxchars;
            for (cp = acstrans; *cp; cp++) {
-               sp = strchr(acs_chars, *cp);
+               sp = (strchr) (acs_chars, *cp);
                if (sp)
                    *tp++ = sp[1];
                else {