ncurses 6.1 - patch 20200104

[ncurses.git] / include / MKterm.h.awk.in

diff --git a/include/MKterm.h.awk.in b/include/MKterm.h.awk.in
index 1564656b0a8f0faa914b81185dff3c746442815a..c315e2e1a216631f49bc35d0a347d4b8d3e7f4ad 100644 (file)
--- a/include/MKterm.h.awk.in
+++ b/include/MKterm.h.awk.in
@@ -26,7 +26,7 @@ BEGIN {
        lcurl = "{";
        rcurl = "}";
        print  "/****************************************************************************"
-       print  " * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *"
+       print  " * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *"
        print  " *                                                                          *"
        print  " * Permission is hereby granted, free of charge, to any person obtaining a  *"
        print  " * copy of this software and associated documentation files (the            *"
@@ -59,7 +59,7 @@ BEGIN {
        print  "/*    and: Thomas E. Dickey                        1995-on                  */"
        print  "/****************************************************************************/"
        print  ""
-       print  "/* $Id: MKterm.h.awk.in,v 1.68 2018/04/07 20:51:01 tom Exp $ */"
+       print  "/* $Id: MKterm.h.awk.in,v 1.73 2019/12/21 18:29:09 tom Exp $ */"
        print  ""
        print  "/*"
        print  "**      term.h -- Definition of struct term"
@@ -126,7 +126,7 @@ BEGIN {
        print  ""
        print  "#else /* !HAVE_TERMIO_H */"
        print  ""
-       print  "#if __MINGW32__"
+       print  "#if _WIN32"
        print  "#  include <ncurses_mingw.h>"
        print  "#  define TTY struct termios"
        print  "#else"
@@ -147,6 +147,10 @@ BEGIN {
        print  "#define SET_TTY(fd, buf) stty(fd, buf)"
        print  "#endif"
        print  ""
+       print  "#ifndef GCC_NORETURN"
+       print  "#define GCC_NORETURN /* nothing */"
+       print  "#endif"
+       print  ""
        print  "#define NAMESIZE 256"
        print  ""
        print  "/* The cast works because TERMTYPE is the first data in TERMINAL */"
@@ -163,14 +167,19 @@ $2 == "%%-STOP-HERE-%%" {
        print  "/* older synonyms for some capabilities */"
        print  "#define beehive_glitch  no_esc_ctlc"
        print  "#define teleray_glitch  dest_tabs_magic_smso"
+       print  ""
+       print  "/* HPUX-11 uses this name rather than the standard one */"
+       print  "#ifndef micro_char_size"
        print  "#define micro_char_size micro_col_size"
+       print  "#endif"
        print  ""
        print  "#ifdef __INTERNAL_CAPS_VISIBLE"
 }
 
-/^#/ {
-       next;
-}
+/^#/ { next; }
+
+/^used_by/ { next ; }
+/^userdef/ { next ; }
 
 $1 == "acs_chars" {
        acsindex = StringCount;
@@ -293,12 +302,14 @@ END {
        print  ""
        print  ""
        print  "/*"
-       print  " * These entrypoints are used by tack."
+       print  " * These entrypoints are used by tack 1.07."
        print  " */"
        print  "extern NCURSES_EXPORT(const TERMTYPE *) _nc_fallback (const char *);"
        print  "extern NCURSES_EXPORT(int) _nc_read_entry (const char * const, char * const, TERMTYPE *const);"
        print  ""
-       print  "/* Normal entry points */"
+       print  "/*"
+       print  " * Normal entry points"
+       print  " */"
        print  "extern NCURSES_EXPORT(TERMINAL *) set_curterm (TERMINAL *);"
        print  "extern NCURSES_EXPORT(int) del_curterm (TERMINAL *);"
        print  ""
@@ -366,6 +377,11 @@ END {
        print  "extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(restartterm) (SCREEN*, NCURSES_CONST char *, int, int *);"
        print  "#endif /* NCURSES_SP_FUNCS */"
        print  ""
+       print  "/*"
+       print  " * Debugging features."
+       print  " */"
+       print  "extern NCURSES_EXPORT(void)    exit_terminfo(int) GCC_NORETURN;"
+       print  ""
        print  "#ifdef __cplusplus"
        printf "%s\n", rcurl;
        print  "#endif"