ncurses 6.1 - patch 20180707

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

diff --git a/ncurses/tinfo/MKcodes.awk b/ncurses/tinfo/MKcodes.awk
index fbb9d03dc5b0de19063d8891930e377bee63bd9a..97e5131ba07ce9d51e76ae8a5045f5ae0bd29d8d 100644 (file)
--- a/ncurses/tinfo/MKcodes.awk
+++ b/ncurses/tinfo/MKcodes.awk
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2009,2010 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: MKcodes.awk,v 1.6 2009/03/21 21:03:39 tom Exp $
+# $Id: MKcodes.awk,v 1.9 2010/01/23 17:57:43 tom Exp $
 function large_item(value) {
        result = sprintf("%d,", offset);
        offset = offset + length(value) + 1;
@@ -101,8 +101,6 @@ END {
                print  ""
                print  "#if BROKEN_LINKER || USE_REENTRANT"
                print  ""
-               print  "#include <term.h>"
-               print  ""
                if (bigstrings) {
                        printf "static const char _nc_code_blob[] = \n"
                        printf "%s;\n", bigstr;
@@ -117,7 +115,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_code_blob + offsets[n];"
+                       print  "                                (*value)[n] = (NCURSES_CONST char *) _nc_code_blob + offsets[n];"
                        print  "                        }"
                        print  "                }"
                        print  "        }"
@@ -131,7 +129,7 @@ END {
                        print_strings("boolcodes", small_boolcodes);
                        print_strings("numcodes", small_numcodes);
                        print_strings("strcodes", small_strcodes);
-                       print  "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API _nc_##it(void) { return data##it; }"
+                       print  "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API NCURSES_PUBLIC_VAR(it)(void) { return data##it; }"
                }
                print  ""
                print  "/* remove public definition which conflicts with FIX() */"