ncurses 5.6 - patch 20070310

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

diff --git a/include/MKterm.h.awk.in b/include/MKterm.h.awk.in
index 8243aea52dbef8cfd3cf8641d949ac6a7438b813..ee22f014d128bf1eef2aec4bed64ac85219120d0 100644 (file)
--- a/include/MKterm.h.awk.in
+++ b/include/MKterm.h.awk.in
@@ -1,6 +1,6 @@
 BEGIN          {
                    print  "/****************************************************************************"
-                   print  " * Copyright (c) 1998,1999,2000,2001 Free Software Foundation, Inc.         *"
+                   print  " * Copyright (c) 1998-2003,2006 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            *"
@@ -30,9 +30,10 @@ BEGIN                {
                    print  "/****************************************************************************/"
                    print  "/* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995                */"
                    print  "/*    and: Eric S. Raymond <esr@snark.thyrsus.com>                          */"
+                   print  "/*    and: Thomas E. Dickey                        1995-on                  */"
                    print  "/****************************************************************************/"
                    print  ""
-                   print  "/* $Id: MKterm.h.awk.in,v 1.41 2001/12/23 01:04:38 tom Exp $ */"
+                   print  "/* $Id: MKterm.h.awk.in,v 1.47 2006/11/26 01:18:23 tom Exp $ */"
                    print  ""
                    print  "/*"
                    print  "**  term.h -- Definition of struct term"
@@ -54,15 +55,12 @@ BEGIN               {
                    print  " * definition (based on the system for which this was configured)."
                    print  " */"
                    print  ""
-                   print  "#undef  HAVE_TERMIOS_H"
-                   print  "#define HAVE_TERMIOS_H 1/*default*/"
-                   print  ""
-                   print  "#undef  HAVE_TCGETATTR"
-                   print  "#define HAVE_TCGETATTR 1/*default*/"
-                   print  ""
                    print  "#undef  NCURSES_CONST"
                    print  "#define NCURSES_CONST @NCURSES_CONST@"
                    print  ""
+                   print  "#undef  NCURSES_SBOOL"
+                   print  "#define NCURSES_SBOOL @NCURSES_SBOOL@"
+                   print  ""
                    print  "#undef  NCURSES_XNAMES"
                    print  "#define NCURSES_XNAMES @NCURSES_XNAMES@"
                    print  ""
@@ -74,7 +72,8 @@ BEGIN         {
                    print  "#undef  GET_TTY"
                    print  ""
                    print  "/* Assume POSIX termio if we have the header and function */"
-                   print  "#if HAVE_TERMIOS_H && HAVE_TCGETATTR"
+                   print  "/* #if HAVE_TERMIOS_H && HAVE_TCGETATTR */"
+                   print  "#if @HAVE_TERMIOS_H@ && @HAVE_TCGETATTR@"
                    print  ""
                    print  "#undef  TERMIOS"
                    print  "#define TERMIOS 1"
@@ -84,7 +83,8 @@ BEGIN         {
                    print  ""
                    print  "#else /* !HAVE_TERMIOS_H */"
                    print  ""
-                   print  "#if HAVE_TERMIO_H"
+                   print  "/* #if HAVE_TERMIO_H */"
+                   print  "#if @HAVE_TERMIO_H@"
                    print  ""
                    print  "#undef  TERMIOS"
                    print  "#define TERMIOS 1"
@@ -199,7 +199,7 @@ END         {
                        print  "typedef struct termtype {       /* in-core form of terminfo data */"
                        print  "    char  *term_names;          /* str_table offset of term names */"
                        print  "    char  *str_table;           /* pointer to string table */"
-                       print  "    char  *Booleans;            /* array of boolean values */"
+                       print  "    NCURSES_SBOOL  *Booleans;   /* array of boolean values */"
                        print  "    short *Numbers;             /* array of integer values */"
                        print  "    char  **Strings;            /* array of string offsets */"
                        print  ""
@@ -224,6 +224,7 @@ END         {
                        print  "    TTY         Ottyb,          /* original state of the terminal */"
                        print  "                Nttyb;          /* current state of the terminal */"
                        print  "    int         _baudrate;      /* used to compute padding */"
+                       print  "    char *      _termname;      /* used for termname() */"
                        print  "} TERMINAL;"
                        print  ""
                        print  "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;"
@@ -268,9 +269,9 @@ END         {
                        print  "extern NCURSES_EXPORT(int) _nc_get_tty_mode (TTY *buf);"
                        print  "extern NCURSES_EXPORT(int) _nc_read_entry (const char * const, char * const, TERMTYPE *const);"
                        print  "extern NCURSES_EXPORT(int) _nc_read_file_entry (const char *const, TERMTYPE *);"
+                       print  "extern NCURSES_EXPORT(int) _nc_read_termtype (TERMTYPE *, char *, int);"
                        print  "extern NCURSES_EXPORT(char *) _nc_first_name (const char *const);"
                        print  "extern NCURSES_EXPORT(int) _nc_name_match (const char *const, const char *const, const char *const);"
-                       print  "extern NCURSES_EXPORT(int) _nc_read_termcap_entry (const char *const, TERMTYPE *const);"
                        print  "extern NCURSES_EXPORT(const TERMTYPE *) _nc_fallback (const char *);"
                        print  ""
                        print  "/* entry points */"
@@ -284,11 +285,18 @@ END               {
                        print  "/* terminfo entry points, also declared in curses.h */"
                        print  "#if !defined(__NCURSES_H)"
                        print  "extern NCURSES_EXPORT(char *) tigetstr (NCURSES_CONST char *);"
-                       print  "extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...);"
                        print  "extern NCURSES_EXPORT_VAR(char) ttytype[];"
                        print  "extern NCURSES_EXPORT(int) putp (const char *);"
                        print  "extern NCURSES_EXPORT(int) tigetflag (NCURSES_CONST char *);"
                        print  "extern NCURSES_EXPORT(int) tigetnum (NCURSES_CONST char *);"
+                       print  ""
+                       print  "#if @NCURSES_TPARM_VARARGS@ /* NCURSES_TPARM_VARARGS */"
+                       print  "extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...);        /* implemented */"
+                       print  "#else"
+                       print  "extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long);       /* implemented */"
+                       print  "extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);        /* implemented */"
+                       print  "#endif"
+                       print  ""
                        print  "#endif /* __NCURSES_H */"
                        print  ""
                        print  "/* termcap database emulation (XPG4 uses const only for 2nd param of tgetent) */"