ncurses 6.0 - patch 20161210

[ncurses.git] / ncurses / llib-lncursesw

diff --git a/ncurses/llib-lncursesw b/ncurses/llib-lncursesw
index 217ae1b522db9f9213f0364743f98426848ffc7b..04729a1aaa2c5f059f0a4a549d0750aaa865890e 100644 (file)
--- a/ncurses/llib-lncursesw
+++ b/ncurses/llib-lncursesw
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2001-2013,2015 Free Software Foundation, Inc.              *
+ * Copyright (c) 2001-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            *
@@ -1904,13 +1904,6 @@ int      leaveok(
 
 /* ./base/lib_mouse.c */
 
-typedef struct {
-    int nerror; 
-    int nparam; 
-    int params[9];
-    int final; 
-} SGR_DATA;
-
 #undef getmouse_sp
 int    getmouse_sp(
                SCREEN  *sp, 
@@ -2402,28 +2395,6 @@ int      mvwscanw(
 
 /* ./base/lib_screen.c */
 
-typedef enum {
-    pINT 
-    ,pSHORT 
-    ,pBOOL 
-    ,pATTR 
-    ,pCHAR 
-    ,pSIZE 
-    ,pCCHAR 
-} PARAM_TYPE;
-
-typedef struct {
-    const char name[11];
-    attr_t attr;
-} SCR_ATTRS;
-
-typedef struct {
-    const char name[17];
-    PARAM_TYPE type;
-    size_t size;
-    size_t offset;
-} SCR_PARAMS;
-
 #undef getwin_sp
 WINDOW *getwin_sp(
                SCREEN  *sp, 
@@ -3048,10 +3019,6 @@ void     _nc_do_xmc_glitch(
 
 /* ./trace/varargs.c */
 
-typedef enum {
-    atUnknown = 0, atInteger, atFloat, atPoint, atString
-} ARGTYPE;
-
 #undef _nc_varargs
 char   *_nc_varargs(
                const char *fmt, 
@@ -3816,8 +3783,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
@@ -4615,11 +4582,6 @@ char     *_tracecchar_t(
 
 /* ./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)
@@ -4803,9 +4765,11 @@ int      _nc_read_entry(
 
 /* ./tinfo/read_termcap.c */
 
-#undef _nc_read_termcap
-void   _nc_read_termcap(void)
-               { /* void */ }
+#undef _nc_read_termcap_entry
+int    _nc_read_termcap_entry(
+               const char *const tn, 
+               TERMTYPE *const tp)
+               { return(*(int *)0); }
 
 /* ./tinfo/strings.c */
 
@@ -5109,11 +5073,6 @@ int      _nc_capcmp(
                const char *t)
                { return(*(int *)0); }
 
-typedef struct {
-    const char from[3];
-    const char to[6];
-} assoc;
-
 /* ./tinfo/write_entry.c */
 
 #undef _nc_set_writedir
@@ -5126,6 +5085,14 @@ void     _nc_write_entry(
                TERMTYPE *const tp)
                { /* void */ }
 
+#undef _nc_write_object
+int    _nc_write_object(
+               TERMTYPE *tp, 
+               char    *buffer, 
+               unsigned *offset, 
+               unsigned limit)
+               { return(*(int *)0); }
+
 #undef _nc_tic_written
 int    _nc_tic_written(void)
                { return(*(int *)0); }