ncurses 6.2 - patch 20200531

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

diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
index 5a3770e501403e819c2dd149dba624eee05f72d8..cdc7368b359ce23389874fff4748442bd8f2bfeb 100755 (executable)
--- a/ncurses/base/MKlib_gen.sh
+++ b/ncurses/base/MKlib_gen.sh
@@ -2,7 +2,7 @@
 #
 # 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.63 2020/02/02 23:34:34 tom Exp $)
+# ($Id: MKlib_gen.sh,v 1.66 2020/05/23 23:59:39 anonymous.maarten Exp $)

 #
 ##############################################################################
 # Copyright 2018,2020 Thomas E. Dickey                                       #
 #
 ##############################################################################
 # Copyright 2018,2020 Thomas E. Dickey                                       #


@@ -74,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`
 # 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
 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


@@ -178,7 +178,7 @@ EOF3
 
 if test "$USE" = generated ; then
 cat >$ED4 <<EOF
 
 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
        /attr_[sg]et.* z)/s,z),z GCC_UNUSED),
 EOF
 else


@@ -433,6 +433,7 @@ BEGIN               {
                print "#include <ncurses_cfg.h>"
                print ""
                print "#undef NCURSES_NOMACROS  /* _this_ file uses macros */"
                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 ""
                print "#include <curses.priv.h>"
                print ""