ncurses 5.7 - patch 20090221

[ncurses.git] / ncurses / tinfo / MKnames.awk

diff --git a/ncurses/tinfo/MKnames.awk b/ncurses/tinfo/MKnames.awk
index 93e682c2d28db529f9a8cd7ca0e263a8827ca969..fd9b9d64280717af7201c28e74a4b6f612c1bc5a 100644 (file)
--- a/ncurses/tinfo/MKnames.awk
+++ b/ncurses/tinfo/MKnames.awk
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2007 Free Software Foundation, Inc.                          #
+# Copyright (c) 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 "Software"), #
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: MKnames.awk,v 1.18 2007/11/03 20:24:15 tom Exp $
+# $Id: MKnames.awk,v 1.21 2008/11/16 00:19:59 juergen Exp $
 function large_item(value) {
        result = sprintf("%d,", offset);
        offset = offset + length(value) + 1;
@@ -107,8 +107,6 @@ END {
                print  ""
                print  "#if BROKEN_LINKER || USE_REENTRANT"
                print  ""
-               print  "#include <term.h>"
-               print  ""
                if (bigstrings) {
                        printf "static const char _nc_name_blob[] = \n"
                        printf "%s;\n", bigstr;
@@ -126,7 +124,7 @@ END {
                        print  "                if ((*value = typeCalloc(NCURSES_CONST char *, size + 1)) != 0) {"
                        print  "                        unsigned n;"
                        print  "                        for (n = 0; n < size; ++n) {"
-                       print  "                                (*value)[n] = _nc_name_blob + offsets[n];"
+                       print  "                                (*value)[n] = (NCURSES_CONST char *) _nc_name_blob + offsets[n];"
                        print  "                        }"
                        print  "                }"
                        print  "        }"
@@ -156,6 +154,7 @@ END {
                print  ""
                print  "#define FREE_FIX(it) if (ptr_##it) { FreeAndNull(ptr_##it); }"
                print  ""
+               print  "#if NO_LEAKS"
                print  "NCURSES_EXPORT(void)"
                print  "_nc_names_leaks(void)"
                print  "{"
@@ -168,6 +167,8 @@ END {
                print  "FREE_FIX(strfnames)"
                }
                print  "}"
+               print  "#endif"
+               print  ""
                print  "#else"
                print  ""
                print  "#define DCL(it) NCURSES_EXPORT_VAR(IT) it[]"