ncurses 6.2 - patch 20201010

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

diff --git a/ncurses/tinfo/MKnames.awk b/ncurses/tinfo/MKnames.awk
index 7e5074480864d7d871171f03aa9efb8bc2a91801..4594c728da888b38db9105c8e8a01a732661efa1 100644 (file)
--- a/ncurses/tinfo/MKnames.awk
+++ b/ncurses/tinfo/MKnames.awk
@@ -1,5 +1,6 @@
 ##############################################################################
-# Copyright (c) 2007,2008 Free Software Foundation, Inc.                     #
+# Copyright 2019,2020 Thomas E. Dickey                                       #
+# Copyright 1998-2008,2009 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 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: MKnames.awk,v 1.20 2008/10/11 21:07:56 tom Exp $
+# $Id: MKnames.awk,v 1.24 2020/02/02 23:34:34 tom Exp $
 function large_item(value) {
        result = sprintf("%d,", offset);
        offset = offset + length(value) + 1;
@@ -79,7 +80,9 @@ BEGIN {
        }
 
 $1 ~ /^#/              {next;}
+$1 ~ /^(cap|info)alias/        {next;}
 
+$1 == "userdef"                {next;}
 $1 == "SKIPWARN"       {next;}
 
 $3 == "bool"   {
@@ -107,8 +110,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;
@@ -133,7 +134,7 @@ END {
                        print  "        return *value;"
                        print  "}"
                        print  ""
-                       print  "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API _nc_##it(void) { return alloc_array(&ptr_##it, _nc_offset_##it, SIZEOF(_nc_offset_##it)); }"
+                       print  "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API NCURSES_PUBLIC_VAR(it)(void) { return alloc_array(&ptr_##it, _nc_offset_##it, SIZEOF(_nc_offset_##it)); }"
                } else {
                        print  "#define DCL(it) static IT data##it[]"
                        print  ""
@@ -143,9 +144,18 @@ END        {
                        print_strings("numfnames", small_numfnames);
                        print_strings("strnames", small_strnames);
                        print_strings("strfnames", small_strfnames);
-                       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() */"
+               print  "#undef boolnames"
+               print  "#undef boolfnames"
+               print  "#undef numnames"
+               print  "#undef numfnames"
+               print  "#undef strnames"
+               print  "#undef strfnames"
+               print  ""
+               print  "/* add local definition */"
                print  "FIX(boolnames)"
                print  "FIX(boolfnames)"
                print  "FIX(numnames)"
@@ -153,6 +163,13 @@ END        {
                print  "FIX(strnames)"
                print  "FIX(strfnames)"
                print  ""
+               print  "/* restore the public definition */"
+               print  "#define boolnames  NCURSES_PUBLIC_VAR(boolnames())"
+               print  "#define boolfnames NCURSES_PUBLIC_VAR(boolfnames())"
+               print  "#define numnames   NCURSES_PUBLIC_VAR(numnames())"
+               print  "#define numfnames  NCURSES_PUBLIC_VAR(numfnames())"
+               print  "#define strnames   NCURSES_PUBLIC_VAR(strnames())"
+               print  "#define strfnames  NCURSES_PUBLIC_VAR(strfnames())"
                print  ""
                print  "#define FREE_FIX(it) if (ptr_##it) { FreeAndNull(ptr_##it); }"
                print  ""