ncurses 6.1 - patch 20191005

[ncurses.git] / ncurses / base / MKlib_gen.sh

diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
index 643a53d47c6299c80d9a17f98bb1691331ecab4b..a1587c42445225a7557f9c3f36d3afdc34d7119b 100755 (executable)
--- a/ncurses/base/MKlib_gen.sh
+++ b/ncurses/base/MKlib_gen.sh
@@ -2,10 +2,10 @@
 #
 # MKlib_gen.sh -- generate sources from curses.h macro definitions
 #
 #
 # MKlib_gen.sh -- generate sources from curses.h macro definitions
 #

-# ($Id: MKlib_gen.sh,v 1.59 2017/11/25 23:05:56 tom Exp $)
+# ($Id: MKlib_gen.sh,v 1.62 2018/06/09 19:27:00 tom Exp $)

 #
 ##############################################################################
 #
 ##############################################################################

-# Copyright (c) 1998-2017,2017 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2017,2018 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"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -99,6 +99,7 @@ if test "$USE" = implemented ; then
        cat >$ED1 <<EOF1
 /^extern.*implemented/{
        h
        cat >$ED1 <<EOF1
 /^extern.*implemented/{
        h

+       s/GCC_DEPRECATED([^)]*)//

        s/NCURSES_SP_NAME(\([^)]*\))/NCURSES_SP_NAME___\1/
        h
        s/^.*implemented:\([^   *]*\).*/P_POUNDCif_USE_\1_SUPPORT/p
        s/NCURSES_SP_NAME(\([^)]*\))/NCURSES_SP_NAME___\1/
        h
        s/^.*implemented:\([^   *]*\).*/P_POUNDCif_USE_\1_SUPPORT/p


@@ -242,6 +243,9 @@ $0 !~ /^P_/ {
                        break;
                }
        }
                        break;
                }
        }

+       if (using == "implemented") {
+               printf "#undef %s\n", $myfunc;
+       }

        print $0;
        print "{";
        argcount = 1;
        print $0;
        print "{";
        argcount = 1;


@@ -408,7 +412,7 @@ EOF1
 
 cat >$AW2 <<EOF1
 BEGIN          {
 
 cat >$AW2 <<EOF1
 BEGIN          {

-               printf "/* This file was generated by $0 */\n"
+               printf "/* This file was generated by $0 $USE */\n"

                print ""
                print "/*"
                print " * DO NOT EDIT THIS FILE BY HAND!"
                print ""
                print "/*"
                print " * DO NOT EDIT THIS FILE BY HAND!"


@@ -431,11 +435,6 @@ BEGIN              {
                print ""
                print "#include <curses.priv.h>"
                print ""
                print ""
                print "#include <curses.priv.h>"
                print ""

-               print "#undef vw_scanw"
-               print "#undef vwscanw"
-               print ""
-               print "#undef vw_printw"
-               print "#undef vwprintw"

                }
 /^DECLARATIONS/        {start = 1; next;}
                {
                }
 /^DECLARATIONS/        {start = 1; next;}
                {