ncurses 6.1 - patch 20181229

[ncurses.git] / ncurses / llib-ltinfo

diff --git a/ncurses/llib-ltinfo b/ncurses/llib-ltinfo
index 44a086825434d6b996028b68f857407a2555d7ea..f24574260b6d8da9b749bf2393eac46b9bd9b340 100644 (file)
--- a/ncurses/llib-ltinfo
+++ b/ncurses/llib-ltinfo
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2012-2013,2015 Free Software Foundation, Inc.              *
+ * Copyright (c) 2012-2016,2017 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            *
@@ -34,6 +34,7 @@
 /* ./tinfo/access.c */
 
 #include <curses.priv.h>
+
 #undef _nc_rootname
 char   *_nc_rootname(
                char    *path)
@@ -87,8 +88,8 @@ int   _nc_add_to_try(
 
 #undef _nc_align_termtype
 void   _nc_align_termtype(
-               TERMTYPE *to, 
-               TERMTYPE *from)
+               TERMTYPE2 *to, 
+               TERMTYPE2 *from)
                { /* void */ }
 
 #undef _nc_copy_termtype
@@ -235,7 +236,7 @@ ENTRY       *_nc_tail;
 #undef _nc_free_entry
 void   _nc_free_entry(
                ENTRY   *headp, 
-               TERMTYPE *tterm)
+               TERMTYPE2 *tterm)
                { /* void */ }
 
 #undef _nc_free_entries
@@ -243,12 +244,6 @@ void       _nc_free_entries(
                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 */ }
@@ -256,9 +251,9 @@ void        _nc_leaks_tinfo(void)
 /* ./fallback.c */
 
 #undef _nc_fallback
-const TERMTYPE *_nc_fallback(
+const TERMTYPE2 *_nc_fallback(
                const char *name)
-               { return(*(const TERMTYPE **)0); }
+               { return(*(const TERMTYPE2 **)0); }
 
 /* ./tinfo/free_ttype.c */
 
@@ -318,8 +313,8 @@ void        _nc_init_acs(void)
 /* ./tinfo/lib_baudrate.c */
 
 struct speed {
-    short s; 
-    int sp; 
+    int given_speed; 
+    int actual_speed; 
 };
 
 #undef _nc_baudrate
@@ -712,7 +707,7 @@ void        _nc_update_screensize(
 #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
@@ -1264,12 +1259,12 @@ void    _nc_set_buffer(
 
 #undef _nc_init_termtype
 void   _nc_init_termtype(
-               TERMTYPE *const tp)
+               TERMTYPE2 *const tp)
                { /* void */ }
 
 #undef _nc_read_termtype
 int    _nc_read_termtype(
-               TERMTYPE *ptr, 
+               TERMTYPE2 *ptr, 
                char    *buffer, 
                int     limit)
                { return(*(int *)0); }
@@ -1277,14 +1272,14 @@ int     _nc_read_termtype(
 #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, 
-               TERMTYPE *const tp)
+               TERMTYPE2 *const tp)
                { return(*(int *)0); }
 
 /* ./tinfo/read_termcap.c */
@@ -1373,7 +1368,7 @@ int       _nc_remove_string(
 
 #undef _nc_trim_sgr0
 char   *_nc_trim_sgr0(
-               TERMTYPE *tp)
+               TERMTYPE2 *tp)
                { return(*(char **)0); }
 
 /* ./unctrl.c */