ncurses 6.1 - patch 20200118

[ncurses.git] / ncurses / llib-ltinfot

diff --git a/ncurses/llib-ltinfot b/ncurses/llib-ltinfot
index 11f0d957b2da100be0dfb0c71c7cafe5cee1d30f..e33aefbb2a1c91a775f030e73bd19786cc854a43 100644 (file)
--- a/ncurses/llib-ltinfot
+++ b/ncurses/llib-ltinfot
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2013-2013,2015 Free Software Foundation, Inc.              *
+ * Copyright (c) 2013-2017,2019 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -34,8 +34,6 @@
 /* ./tinfo/access.c */
 
 #include <curses.priv.h>
 /* ./tinfo/access.c */
 
 #include <curses.priv.h>

-#include <ctype.h>
-#include <tic.h>

 
 #undef _nc_rootname
 char   *_nc_rootname(
 
 #undef _nc_rootname
 char   *_nc_rootname(


@@ -90,8 +88,8 @@ int   _nc_add_to_try(
 
 #undef _nc_align_termtype
 void   _nc_align_termtype(
 
 #undef _nc_align_termtype
 void   _nc_align_termtype(

-               TERMTYPE *to, 
-               TERMTYPE *from)
+               TERMTYPE2 *to, 
+               TERMTYPE2 *from)

                { /* void */ }
 
 #undef _nc_copy_termtype
                { /* void */ }
 
 #undef _nc_copy_termtype


@@ -116,8 +114,6 @@ const char *const *_nc_strcodes(void)
 
 /* ./comp_captab.c */
 
 
 /* ./comp_captab.c */
 

-#include <hashsize.h>
-

 #undef _nc_get_table
 const struct name_table_entry *_nc_get_table(
                NCURSES_BOOL termcap)
 #undef _nc_get_table
 const struct name_table_entry *_nc_get_table(
                NCURSES_BOOL termcap)


@@ -199,9 +195,22 @@ struct name_table_entry const *_nc_find_type_entry(
                NCURSES_BOOL termcap)
                { return(*(struct name_table_entry const **)0); }
 
                NCURSES_BOOL termcap)
                { return(*(struct name_table_entry const **)0); }
 

-/* ./tinfo/db_iterator.c */
+#undef _nc_find_user_entry
+struct user_table_entry const *_nc_find_user_entry(
+               const char *string)
+               { return(*(struct user_table_entry const **)0); }
+
+/* ./comp_userdefs.c */

 
 

-#include <time.h>
+#undef _nc_get_userdefs_table
+const struct user_table_entry *_nc_get_userdefs_table(void)
+               { return(*(const struct user_table_entry **)0); }
+
+#undef _nc_get_hash_user
+const HashData *_nc_get_hash_user(void)
+               { return(*(const HashData **)0); }
+
+/* ./tinfo/db_iterator.c */

 
 #undef _nc_tic_dir
 const char *_nc_tic_dir(
 
 #undef _nc_tic_dir
 const char *_nc_tic_dir(


@@ -247,7 +256,7 @@ ENTRY       *_nc_tail;
 #undef _nc_free_entry
 void   _nc_free_entry(
                ENTRY   *headp, 
 #undef _nc_free_entry
 void   _nc_free_entry(
                ENTRY   *headp, 

-               TERMTYPE *tterm)
+               TERMTYPE2 *tterm)

                { /* void */ }
 
 #undef _nc_free_entries
                { /* void */ }
 
 #undef _nc_free_entries


@@ -255,12 +264,6 @@ void       _nc_free_entries(
                ENTRY   *headp)
                { /* void */ }
 
                ENTRY   *headp)
                { /* void */ }
 

-#undef _nc_delink_entry
-ENTRY  *_nc_delink_entry(
-               ENTRY   *headp, 
-               TERMTYPE *tterm)
-               { return(*(ENTRY **)0); }
-

 #undef _nc_leaks_tinfo
 void   _nc_leaks_tinfo(void)
                { /* void */ }
 #undef _nc_leaks_tinfo
 void   _nc_leaks_tinfo(void)
                { /* void */ }


@@ -268,9 +271,9 @@ void        _nc_leaks_tinfo(void)
 /* ./fallback.c */
 
 #undef _nc_fallback
 /* ./fallback.c */
 
 #undef _nc_fallback

-const TERMTYPE *_nc_fallback(
+const TERMTYPE2 *_nc_fallback(

                const char *name)
                const char *name)

-               { return(*(const TERMTYPE **)0); }
+               { return(*(const TERMTYPE2 **)0); }

 
 /* ./tinfo/free_ttype.c */
 
 
 /* ./tinfo/free_ttype.c */
 


@@ -308,15 +311,6 @@ char       *_nc_home_terminfo(void)
 
 /* ./tinfo/init_keytry.c */
 
 
 /* ./tinfo/init_keytry.c */
 

-#if 0
-
-#include <init_keytry.h>
-
-#undef _nc_tinfo_fkeys
-const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0};
-
-#endif
-

 #undef _nc_init_keytry
 void   _nc_init_keytry(
                SCREEN  *sp)
 #undef _nc_init_keytry
 void   _nc_init_keytry(
                SCREEN  *sp)


@@ -339,11 +333,9 @@ void       _nc_init_acs(void)
 
 /* ./tinfo/lib_baudrate.c */
 
 
 /* ./tinfo/lib_baudrate.c */
 

-#include <termcap.h>
-

 struct speed {
 struct speed {

-    short s; 
-    int sp; 
+    int given_speed; 
+    int actual_speed; 

 };
 
 #undef _nc_baudrate
 };
 
 #undef _nc_baudrate


@@ -714,10 +706,6 @@ int        intrflush(
 
 /* ./tinfo/lib_setup.c */
 
 
 /* ./tinfo/lib_setup.c */
 

-#include <locale.h>
-#include <sys/ioctl.h>
-#include <langinfo.h>
-

 #undef _nc_ttytype
 char   *_nc_ttytype(void)
                { return(*(char **)0); }
 #undef _nc_ttytype
 char   *_nc_ttytype(void)
                { return(*(char **)0); }


@@ -802,7 +790,7 @@ void        _nc_update_screensize(
 #undef _nc_setup_tinfo
 int    _nc_setup_tinfo(
                const char *const tn, 
 #undef _nc_setup_tinfo
 int    _nc_setup_tinfo(
                const char *const tn, 

-               TERMTYPE *const tp)
+               TERMTYPE2 *const tp)

                { return(*(int *)0); }
 
 #undef _nc_tinfo_cmdch
                { return(*(int *)0); }
 
 #undef _nc_tinfo_cmdch


@@ -832,6 +820,14 @@ int        _nc_setupterm(
                int     reuse)
                { return(*(int *)0); }
 
                int     reuse)
                { return(*(int *)0); }
 

+#undef _nc_find_prescr
+SCREEN *_nc_find_prescr(void)
+               { return(*(SCREEN **)0); }
+
+#undef _nc_forget_prescr
+void   _nc_forget_prescr(void)
+               { /* void */ }
+

 #undef new_prescr
 SCREEN *new_prescr(void)
                { return(*(SCREEN **)0); }
 #undef new_prescr
 SCREEN *new_prescr(void)
                { return(*(SCREEN **)0); }


@@ -857,12 +853,6 @@ int        tgetent_sp(
                const char *name)
                { return(*(int *)0); }
 
                const char *name)
                { return(*(int *)0); }
 

-#if 0
-
-#include <capdefaults.c>
-
-#endif
-

 #undef tgetent
 int    tgetent(
                char    *bufp, 
 #undef tgetent
 int    tgetent(
                char    *bufp, 


@@ -1169,6 +1159,13 @@ WINDOW   *_nc_retrace_win(
                WINDOW  *code)
                { return(*(WINDOW **)0); }
 
                WINDOW  *code)
                { return(*(WINDOW **)0); }
 

+#undef _nc_fmt_funcptr
+char   *_nc_fmt_funcptr(
+               char    *target, 
+               const char *source, 
+               size_t  size)
+               { return(*(char **)0); }
+

 #undef _nc_use_tracef
 int    _nc_use_tracef(
                unsigned mask)
 #undef _nc_use_tracef
 int    _nc_use_tracef(
                unsigned mask)


@@ -1227,11 +1224,6 @@ chtype   _nc_retrace_chtype(
 
 /* ./trace/lib_tracebits.c */
 
 
 /* ./trace/lib_tracebits.c */
 

-typedef struct {
-    unsigned int val;
-    const char name[8];
-} BITNAMES;
-

 #undef _nc_trace_ttymode
 char   *_nc_trace_ttymode(
                struct termios *tty)
 #undef _nc_trace_ttymode
 char   *_nc_trace_ttymode(
                struct termios *tty)


@@ -1334,8 +1326,6 @@ int       resetty(void)
 
 /* ./tty/lib_twait.c */
 
 
 /* ./tty/lib_twait.c */
 

-#include <sys/time.h>
-

 #undef _nc_timed_wait
 int    _nc_timed_wait(
                SCREEN  *sp, 
 #undef _nc_timed_wait
 int    _nc_timed_wait(
                SCREEN  *sp, 


@@ -1401,16 +1391,14 @@ void    _nc_set_buffer(
 
 /* ./tinfo/read_entry.c */
 
 
 /* ./tinfo/read_entry.c */
 

-#include <hashed_db.h>
-

 #undef _nc_init_termtype
 void   _nc_init_termtype(
 #undef _nc_init_termtype
 void   _nc_init_termtype(

-               TERMTYPE *const tp)
+               TERMTYPE2 *const tp)

                { /* void */ }
 
 #undef _nc_read_termtype
 int    _nc_read_termtype(
                { /* void */ }
 
 #undef _nc_read_termtype
 int    _nc_read_termtype(

-               TERMTYPE *ptr, 
+               TERMTYPE2 *ptr, 

                char    *buffer, 
                int     limit)
                { return(*(int *)0); }
                char    *buffer, 
                int     limit)
                { return(*(int *)0); }


@@ -1418,20 +1406,18 @@ int     _nc_read_termtype(
 #undef _nc_read_file_entry
 int    _nc_read_file_entry(
                const char *const filename, 
 #undef _nc_read_file_entry
 int    _nc_read_file_entry(
                const char *const filename, 

-               TERMTYPE *ptr)
+               TERMTYPE2 *ptr)

                { return(*(int *)0); }
 
 #undef _nc_read_entry
 int    _nc_read_entry(
                const char *const name, 
                char    *const filename, 
                { return(*(int *)0); }
 
 #undef _nc_read_entry
 int    _nc_read_entry(
                const char *const name, 
                char    *const filename, 

-               TERMTYPE *const tp)
+               TERMTYPE2 *const tp)

                { return(*(int *)0); }
 
 /* ./tinfo/read_termcap.c */
 
                { return(*(int *)0); }
 
 /* ./tinfo/read_termcap.c */
 

-#include <sys/types.h>
-

 #undef _nc_read_termcap
 void   _nc_read_termcap(void)
                { /* void */ }
 #undef _nc_read_termcap
 void   _nc_read_termcap(void)
                { /* void */ }


@@ -1516,7 +1502,7 @@ int       _nc_remove_string(
 
 #undef _nc_trim_sgr0
 char   *_nc_trim_sgr0(
 
 #undef _nc_trim_sgr0
 char   *_nc_trim_sgr0(

-               TERMTYPE *tp)
+               TERMTYPE2 *tp)

                { return(*(char **)0); }
 
 /* ./unctrl.c */
                { return(*(char **)0); }
 
 /* ./unctrl.c */