ncurses 6.2 - patch 20200523

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

diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
index c7877bfcd863d325bc4292fa3c87cff8364cfc37..cdc7368b359ce23389874fff4748442bd8f2bfeb 100755 (executable)
--- a/ncurses/base/MKlib_gen.sh
+++ b/ncurses/base/MKlib_gen.sh
@@ -2,10 +2,11 @@
 #
 # MKlib_gen.sh -- generate sources from curses.h macro definitions
 #
-# ($Id: MKlib_gen.sh,v 1.60 2017/12/09 22:27:41 tom Exp $)
+# ($Id: MKlib_gen.sh,v 1.66 2020/05/23 23:59:39 anonymous.maarten Exp $)
 #
 ##############################################################################
-# Copyright (c) 1998-2017,2017 Free Software Foundation, Inc.                #
+# Copyright 2018,2020 Thomas E. Dickey                                       #
+# Copyright 1998-2016,2017 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"), #
@@ -73,7 +74,7 @@ USE="$3"
 # determine if we are using gcc, and if so, what version because the proposed
 # solution uses a nonstandard option.
 PRG=`echo "$1" | $AWK '{ sub(/^[       ]*/,""); sub(/[         ].*$/, ""); print; }' || exit 0`
-FSF=`"$PRG" --version 2>/dev/null || exit 0 | fgrep "Free Software Foundation" | head -n 1`
+FSF=`("$PRG" --version 2>/dev/null || exit 0) | fgrep "Free Software Foundation" | head -n 1`
 ALL=`"$PRG" -dumpversion 2>/dev/null || exit 0`
 ONE=`echo "$ALL" | sed -e 's/\..*$//'`
 if test -n "$FSF" && test -n "$ALL" && test -n "$ONE" ; then
@@ -99,6 +100,7 @@ if test "$USE" = implemented ; then
        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
@@ -176,7 +178,7 @@ EOF3
 
 if test "$USE" = generated ; then
 cat >$ED4 <<EOF
-       s/^\(.*\) \(.*\) (\(.*\))\$/NCURSES_EXPORT(\1) (\2) (\3)/
+       s/^\(.*\) \(.*\) (\(.*\))\$/NCURSES_EXPORT(\1) \2 (\3)/
        /attr_[sg]et.* z)/s,z),z GCC_UNUSED),
 EOF
 else
@@ -431,14 +433,10 @@ BEGIN             {
                print "#include <ncurses_cfg.h>"
                print ""
                print "#undef NCURSES_NOMACROS  /* _this_ file uses macros */"
+               print "#define NCURSES_NOMACROS 1"
                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;}
                {