ncurses 6.0 - patch 20170408

[ncurses.git] / ncurses / llib-ltinfot

diff --git a/ncurses/llib-ltinfot b/ncurses/llib-ltinfot
index 11f0d957b2da100be0dfb0c71c7cafe5cee1d30f..517161da17e6f222e967a84867947db568ad9429 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-2015,2016 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,8 +34,6 @@
 /* ./tinfo/access.c */
 
 #include <curses.priv.h>
-#include <ctype.h>
-#include <tic.h>
 
 #undef _nc_rootname
 char   *_nc_rootname(
@@ -116,8 +114,6 @@ const char *const *_nc_strcodes(void)
 
 /* ./comp_captab.c */
 
-#include <hashsize.h>
-
 #undef _nc_get_table
 const struct name_table_entry *_nc_get_table(
                NCURSES_BOOL termcap)
@@ -201,8 +197,6 @@ struct name_table_entry const *_nc_find_type_entry(
 
 /* ./tinfo/db_iterator.c */
 
-#include <time.h>
-
 #undef _nc_tic_dir
 const char *_nc_tic_dir(
                const char *path)
@@ -308,15 +302,6 @@ char       *_nc_home_terminfo(void)
 
 /* ./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)
@@ -339,11 +324,9 @@ void       _nc_init_acs(void)
 
 /* ./tinfo/lib_baudrate.c */
 
-#include <termcap.h>
-
 struct speed {
-    short s; 
-    int sp; 
+    int given_speed; 
+    int actual_speed; 
 };
 
 #undef _nc_baudrate
@@ -714,10 +697,6 @@ int        intrflush(
 
 /* ./tinfo/lib_setup.c */
 
-#include <locale.h>
-#include <sys/ioctl.h>
-#include <langinfo.h>
-
 #undef _nc_ttytype
 char   *_nc_ttytype(void)
                { return(*(char **)0); }
@@ -857,12 +836,6 @@ int        tgetent_sp(
                const char *name)
                { return(*(int *)0); }
 
-#if 0
-
-#include <capdefaults.c>
-
-#endif
-
 #undef tgetent
 int    tgetent(
                char    *bufp, 
@@ -1227,11 +1200,6 @@ chtype   _nc_retrace_chtype(
 
 /* ./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)
@@ -1334,8 +1302,6 @@ int       resetty(void)
 
 /* ./tty/lib_twait.c */
 
-#include <sys/time.h>
-
 #undef _nc_timed_wait
 int    _nc_timed_wait(
                SCREEN  *sp, 
@@ -1401,8 +1367,6 @@ void      _nc_set_buffer(
 
 /* ./tinfo/read_entry.c */
 
-#include <hashed_db.h>
-
 #undef _nc_init_termtype
 void   _nc_init_termtype(
                TERMTYPE *const tp)
@@ -1430,8 +1394,6 @@ int       _nc_read_entry(
 
 /* ./tinfo/read_termcap.c */
 
-#include <sys/types.h>
-
 #undef _nc_read_termcap
 void   _nc_read_termcap(void)
                { /* void */ }