ncurses 5.9 - patch 20130427

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

diff --git a/include/MKterm.h.awk.in b/include/MKterm.h.awk.in
index 9f635d65bc865bc7b315c93db60b87ac391a0c01..51ffbc3d9ed64fab071fb7f294c62e5e017df7e3 100644 (file)
--- a/include/MKterm.h.awk.in
+++ b/include/MKterm.h.awk.in
@@ -1,7 +1,7 @@
 # vile:awkmode
 BEGIN          {
                    print  "/****************************************************************************"
 # vile:awkmode
 BEGIN          {
                    print  "/****************************************************************************"

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


@@ -34,7 +34,7 @@ BEGIN         {
                    print  "/*    and: Thomas E. Dickey                        1995-on                  */"
                    print  "/****************************************************************************/"
                    print  ""
                    print  "/*    and: Thomas E. Dickey                        1995-on                  */"
                    print  "/****************************************************************************/"
                    print  ""

-                   print  "/* $Id: MKterm.h.awk.in,v 1.55 2009/04/25 18:02:27 tom Exp $ */"
+                   print  "/* $Id: MKterm.h.awk.in,v 1.60 2011/06/25 20:51:00 tom Exp $ */"

                    print  ""
                    print  "/*"
                    print  "**  term.h -- Definition of struct term"
                    print  ""
                    print  "/*"
                    print  "**  term.h -- Definition of struct term"


@@ -93,41 +93,6 @@ BEGIN                {
                    print  "#include <termio.h>"
                    print  "#define TTY struct termio"
                    print  ""
                    print  "#include <termio.h>"
                    print  "#define TTY struct termio"
                    print  ""

-                   print  "/* Add definitions to make termio look like termios."
-                   print  " * But ifdef it, since there are some implementations"
-                   print  " * that try to do this for us in a fake <termio.h>."
-                   print  " */"
-                   print  "#ifndef TCSANOW"
-                   print  "#define TCSANOW TCSETA"
-                   print  "#endif"
-                   print  "#ifndef TCSADRAIN"
-                   print  "#define TCSADRAIN TCSETAW"
-                   print  "#endif"
-                   print  "#ifndef TCSAFLUSH"
-                   print  "#define TCSAFLUSH TCSETAF"
-                   print  "#endif"
-                   print  "#ifndef tcsetattr"
-                   print  "#define tcsetattr(fd, cmd, arg) ioctl(fd, cmd, arg)"
-                   print  "#endif"
-                   print  "#ifndef tcgetattr"
-                   print  "#define tcgetattr(fd, arg) ioctl(fd, TCGETA, arg)"
-                   print  "#endif"
-                   print  "#ifndef cfgetospeed"
-                   print  "#define cfgetospeed(t) ((t)->c_cflag & CBAUD)"
-                   print  "#endif"
-                   print  "#ifndef TCIFLUSH "
-                   print  "#define TCIFLUSH 0"
-                   print  "#endif"
-                   print  "#ifndef TCOFLUSH "
-                   print  "#define TCOFLUSH 1"
-                   print  "#endif"
-                   print  "#ifndef TCIOFLUSH "
-                   print  "#define TCIOFLUSH 2"
-                   print  "#endif"
-                   print  "#ifndef tcflush"
-                   print  "#define tcflush(fd, arg) ioctl(fd, TCFLSH, arg)"
-                   print  "#endif"
-                   print  ""

                    print  "#else /* !HAVE_TERMIO_H */"
                    print  ""
                    print  "#if __MINGW32__"
                    print  "#else /* !HAVE_TERMIO_H */"
                    print  ""
                    print  "#if __MINGW32__"


@@ -309,6 +274,8 @@ END         {
                        print  "extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);        /* special */"
                        print  "#endif"
                        print  ""
                        print  "extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);        /* special */"
                        print  "#endif"
                        print  ""

+                       print  "extern NCURSES_EXPORT(char *) tiparm (const char *, ...);               /* special */"
+                       print  ""

                        print  "#endif /* __NCURSES_H */"
                        print  ""
                        print  "/* termcap database emulation (XPG4 uses const only for 2nd param of tgetent) */"
                        print  "#endif /* __NCURSES_H */"
                        print  ""
                        print  "/* termcap database emulation (XPG4 uses const only for 2nd param of tgetent) */"


@@ -344,10 +311,12 @@ END               {
                        print  "extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tgetent) (SCREEN*, char *, const char *);"
                        print  "extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tgetflag) (SCREEN*, NCURSES_CONST char *);"
                        print  "extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tgetnum) (SCREEN*, NCURSES_CONST char *);"
                        print  "extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tgetent) (SCREEN*, char *, const char *);"
                        print  "extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tgetflag) (SCREEN*, NCURSES_CONST char *);"
                        print  "extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tgetnum) (SCREEN*, NCURSES_CONST char *);"

-                       print  "extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tputs) (SCREEN*, const char *, int, int (*)(int));"
+                       print  "extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(tputs) (SCREEN*, const char *, int, NCURSES_SP_OUTC);"

                        print  ""
                        print  "extern NCURSES_EXPORT(TERMINAL *) NCURSES_SP_NAME(set_curterm) (SCREEN*, TERMINAL *);"
                        print  "extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(del_curterm) (SCREEN*, TERMINAL *);"
                        print  ""
                        print  "extern NCURSES_EXPORT(TERMINAL *) NCURSES_SP_NAME(set_curterm) (SCREEN*, TERMINAL *);"
                        print  "extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(del_curterm) (SCREEN*, TERMINAL *);"

+                       print  ""
+                       print  "extern NCURSES_EXPORT(int)     NCURSES_SP_NAME(restartterm) (SCREEN*, NCURSES_CONST char *, int, int *);"

                        print  "#endif /* NCURSES_SP_FUNCS */"
                        print  ""
                        print  "#ifdef __cplusplus"
                        print  "#endif /* NCURSES_SP_FUNCS */"
                        print  ""
                        print  "#ifdef __cplusplus"