]> ncurses.scripts.mit.edu Git - ncurses.git/blobdiff - ncurses/llib-lncurses
ncurses 6.3 - patch 20211021
[ncurses.git] / ncurses / llib-lncurses
index bca3288b9df8026b7c8e7487570df130889d89ad..c0adc1ef24e97e4e8febf98fd003abbe34212ad2 100644 (file)
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
+ * Copyright 2019,2020,2021 Thomas E. Dickey                                *
+ * Copyright 1998-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            *
@@ -27,7 +28,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey 1996-2007                                      *
+ *  Author: Thomas E. Dickey       1996-on                                  *
  ****************************************************************************/
 /* LINTLIBRARY */
 
 #undef _nc_oldnums
 int    *_nc_oldnums;
 
+#undef _nc_scroll_optimize_sp
+void   _nc_scroll_optimize_sp(
+               SCREEN  *sp)
+               { /* void */ }
+
 #undef _nc_scroll_optimize
 void   _nc_scroll_optimize(void)
                { /* void */ }
 
+#undef _nc_linedump_sp
+void   _nc_linedump_sp(
+               SCREEN  *sp)
+               { /* void */ }
+
 #undef _nc_linedump
 void   _nc_linedump(void)
                { /* void */ }
 
 /* ./tty/hashmap.c */
 
-#include <term.h>
+#undef _nc_hash_map_sp
+void   _nc_hash_map_sp(
+               SCREEN  *sp)
+               { /* void */ }
 
 #undef _nc_hash_map
 void   _nc_hash_map(void)
                { /* void */ }
 
+#undef _nc_make_oldhash_sp
+void   _nc_make_oldhash_sp(
+               SCREEN  *sp,
+               int     i)
+               { /* void */ }
+
 #undef _nc_make_oldhash
 void   _nc_make_oldhash(
                int     i)
                { /* void */ }
 
+#undef _nc_scroll_oldhash_sp
+void   _nc_scroll_oldhash_sp(
+               SCREEN  *sp,
+               int     n,
+               int     top,
+               int     bot)
+               { /* void */ }
+
 #undef _nc_scroll_oldhash
 void   _nc_scroll_oldhash(
-               int     n, 
-               int     top, 
+               int     n,
+               int     top,
                int     bot)
                { /* void */ }
 
 /* ./base/lib_addch.c */
 
-#include <ctype.h>
-
 #undef _nc_render
 chtype _nc_render(
-               WINDOW  *win, 
+               WINDOW  *win,
                chtype  ch)
                { return(*(chtype *)0); }
 
 #undef _nc_waddch_nosync
 int    _nc_waddch_nosync(
-               WINDOW  *win, 
+               WINDOW  *win,
                const chtype c)
                { return(*(int *)0); }
 
 #undef waddch
 int    waddch(
-               WINDOW  *win, 
+               WINDOW  *win,
                const chtype ch)
                { return(*(int *)0); }
 
 #undef wechochar
 int    wechochar(
-               WINDOW  *win, 
+               WINDOW  *win,
                const chtype ch)
                { return(*(int *)0); }
 
@@ -98,20 +124,25 @@ int        wechochar(
 
 #undef waddnstr
 int    waddnstr(
-               WINDOW  *win, 
-               const char *astr, 
+               WINDOW  *win,
+               const char *astr,
                int     n)
                { return(*(int *)0); }
 
 #undef waddchnstr
 int    waddchnstr(
-               WINDOW  *win, 
-               const chtype *astr, 
+               WINDOW  *win,
+               const chtype *astr,
                int     n)
                { return(*(int *)0); }
 
 /* ./base/lib_beep.c */
 
+#undef beep_sp
+int    beep_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef beep
 int    beep(void)
                { return(*(int *)0); }
@@ -120,13 +151,13 @@ int       beep(void)
 
 #undef wbkgdset
 void   wbkgdset(
-               WINDOW  *win, 
+               WINDOW  *win,
                chtype  ch)
                { /* void */ }
 
 #undef wbkgd
 int    wbkgd(
-               WINDOW  *win, 
+               WINDOW  *win,
                chtype  ch)
                { return(*(int *)0); }
 
@@ -134,14 +165,14 @@ int       wbkgd(
 
 #undef wborder
 int    wborder(
-               WINDOW  *win, 
-               chtype  ls, 
-               chtype  rs, 
-               chtype  ts, 
-               chtype  bs, 
-               chtype  tl, 
-               chtype  tr, 
-               chtype  bl, 
+               WINDOW  *win,
+               chtype  ls,
+               chtype  rs,
+               chtype  ts,
+               chtype  bs,
+               chtype  tl,
+               chtype  tr,
+               chtype  bl,
                chtype  br)
                { return(*(int *)0); }
 
@@ -149,10 +180,10 @@ int       wborder(
 
 #undef wchgat
 int    wchgat(
-               WINDOW  *win, 
-               int     n, 
-               attr_t  attr, 
-               short   color, 
+               WINDOW  *win,
+               int     n,
+               attr_t  attr,
+               short   pair_arg,
                const void *opts)
                { return(*(int *)0); }
 
@@ -167,7 +198,7 @@ int wclear(
 
 #undef clearok
 int    clearok(
-               WINDOW  *win, 
+               WINDOW  *win,
                NCURSES_BOOL flag)
                { return(*(int *)0); }
 
@@ -187,74 +218,171 @@ int      wclrtoeol(
 
 /* ./base/lib_color.c */
 
-#include <tic.h>
-
 #undef COLOR_PAIRS
 int    COLOR_PAIRS;
 #undef COLORS
 int    COLORS;
 
+#undef _nc_reset_colors_sp
+NCURSES_BOOL _nc_reset_colors_sp(
+               SCREEN  *sp)
+               { return(*(NCURSES_BOOL *)0); }
+
 #undef _nc_reset_colors
 NCURSES_BOOL _nc_reset_colors(void)
                { return(*(NCURSES_BOOL *)0); }
 
+#undef start_color_sp
+int    start_color_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef start_color
 int    start_color(void)
                { return(*(int *)0); }
 
+#undef _nc_change_pair
+void   _nc_change_pair(
+               SCREEN  *sp,
+               int     pair)
+               { /* void */ }
+
+#undef _nc_reserve_pairs
+void   _nc_reserve_pairs(
+               SCREEN  *sp,
+               int     want)
+               { /* void */ }
+
+#undef _nc_init_pair
+int    _nc_init_pair(
+               SCREEN  *sp,
+               int     pair,
+               int     f,
+               int     b)
+               { return(*(int *)0); }
+
+#undef init_pair_sp
+int    init_pair_sp(
+               SCREEN  *sp,
+               short   pair,
+               short   f,
+               short   b)
+               { return(*(int *)0); }
+
 #undef init_pair
 int    init_pair(
-               short   pair, 
-               short   f, 
+               short   pair,
+               short   f,
+               short   b)
+               { return(*(int *)0); }
+
+#undef _nc_init_color
+int    _nc_init_color(
+               SCREEN  *sp,
+               int     color,
+               int     r,
+               int     g,
+               int     b)
+               { return(*(int *)0); }
+
+#undef init_color_sp
+int    init_color_sp(
+               SCREEN  *sp,
+               short   color,
+               short   r,
+               short   g,
                short   b)
                { return(*(int *)0); }
 
 #undef init_color
 int    init_color(
-               short   color, 
-               short   r, 
-               short   g, 
+               short   color,
+               short   r,
+               short   g,
                short   b)
                { return(*(int *)0); }
 
+#undef can_change_color_sp
+NCURSES_BOOL can_change_color_sp(
+               SCREEN  *sp)
+               { return(*(NCURSES_BOOL *)0); }
+
 #undef can_change_color
 NCURSES_BOOL can_change_color(void)
                { return(*(NCURSES_BOOL *)0); }
 
+#undef has_colors_sp
+NCURSES_BOOL has_colors_sp(
+               SCREEN  *sp)
+               { return(*(NCURSES_BOOL *)0); }
+
 #undef has_colors
 NCURSES_BOOL has_colors(void)
                { return(*(NCURSES_BOOL *)0); }
 
+#undef color_content_sp
+int    color_content_sp(
+               SCREEN  *sp,
+               short   color,
+               short   *r,
+               short   *g,
+               short   *b)
+               { return(*(int *)0); }
+
 #undef color_content
 int    color_content(
-               short   color, 
-               short   *r, 
-               short   *g, 
+               short   color,
+               short   *r,
+               short   *g,
+               short   *b)
+               { return(*(int *)0); }
+
+#undef _nc_pair_content
+int    _nc_pair_content(
+               SCREEN  *sp,
+               int     pair,
+               int     *f,
+               int     *b)
+               { return(*(int *)0); }
+
+#undef pair_content_sp
+int    pair_content_sp(
+               SCREEN  *sp,
+               short   pair,
+               short   *f,
                short   *b)
                { return(*(int *)0); }
 
 #undef pair_content
 int    pair_content(
-               short   pair, 
-               short   *f, 
+               short   pair,
+               short   *f,
                short   *b)
                { return(*(int *)0); }
 
+#undef _nc_do_color_sp
+void   _nc_do_color_sp(
+               SCREEN  *sp,
+               int     old_pair,
+               int     pair,
+               int     reverse,
+               NCURSES_OUTC_sp outc)
+               { /* void */ }
+
 #undef _nc_do_color
 void   _nc_do_color(
-               short   old_pair, 
-               short   pair, 
-               NCURSES_BOOL reverse, 
-               int     (*outc)(
-               int     p1))
+               int     old_pair,
+               int     pair,
+               int     reverse,
+               NCURSES_OUTC outc)
                { /* void */ }
 
 /* ./base/lib_colorset.c */
 
 #undef wcolor_set
 int    wcolor_set(
-               WINDOW  *win, 
-               short   color_pair_number, 
+               WINDOW  *win,
+               short   pair_arg,
                void    *opts)
                { return(*(int *)0); }
 
@@ -274,16 +402,31 @@ int       delwin(
 
 /* ./base/lib_echo.c */
 
+#undef echo_sp
+int    echo_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef echo
 int    echo(void)
                { return(*(int *)0); }
 
+#undef noecho_sp
+int    noecho_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef noecho
 int    noecho(void)
                { return(*(int *)0); }
 
 /* ./base/lib_endwin.c */
 
+#undef endwin_sp
+int    endwin_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef endwin
 int    endwin(void)
                { return(*(int *)0); }
@@ -297,6 +440,11 @@ int        werase(
 
 /* ./base/lib_flash.c */
 
+#undef flash_sp
+int    flash_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef flash
 int    flash(void)
                { return(*(int *)0); }
@@ -310,7 +458,7 @@ int addch(
 
 #undef addchnstr
 int    addchnstr(
-               const chtype *a1, 
+               const chtype *a1,
                int     z)
                { return(*(int *)0); }
 
@@ -321,7 +469,7 @@ int addchstr(
 
 #undef addnstr
 int    addnstr(
-               const char *a1, 
+               const char *a1,
                int     z)
                { return(*(int *)0); }
 
@@ -347,27 +495,27 @@ int       attrset(
 
 #undef attr_get
 int    attr_get(
-               attr_t  *a1, 
-               short   *a2, 
+               attr_t  *a1,
+               short   *a2,
                void    *z)
                { return(*(int *)0); }
 
 #undef attr_off
 int    attr_off(
-               attr_t  a1, 
+               attr_t  a1,
                void    *z)
                { return(*(int *)0); }
 
 #undef attr_on
 int    attr_on(
-               attr_t  a1, 
+               attr_t  a1,
                void    *z)
                { return(*(int *)0); }
 
 #undef attr_set
 int    attr_set(
-               attr_t  a1, 
-               short   a2, 
+               attr_t  a1,
+               short   a2,
                void    *z)
                { return(*(int *)0); }
 
@@ -383,28 +531,28 @@ void      bkgdset(
 
 #undef border
 int    border(
-               chtype  a1, 
-               chtype  a2, 
-               chtype  a3, 
-               chtype  a4, 
-               chtype  a5, 
-               chtype  a6, 
-               chtype  a7, 
+               chtype  a1,
+               chtype  a2,
+               chtype  a3,
+               chtype  a4,
+               chtype  a5,
+               chtype  a6,
+               chtype  a7,
                chtype  z)
                { return(*(int *)0); }
 
 #undef box
 int    box(
-               WINDOW  *a1, 
-               chtype  a2, 
+               WINDOW  *a1,
+               chtype  a2,
                chtype  z)
                { return(*(int *)0); }
 
 #undef chgat
 int    chgat(
-               int     a1, 
-               attr_t  a2, 
-               short   a3, 
+               int     a1,
+               attr_t  a2,
+               short   a3,
                const void *z)
                { return(*(int *)0); }
 
@@ -422,7 +570,7 @@ int clrtoeol(void)
 
 #undef color_set
 int    color_set(
-               short   a1, 
+               short   a1,
                void    *z)
                { return(*(int *)0); }
 
@@ -459,7 +607,7 @@ int getch(void)
 
 #undef getnstr
 int    getnstr(
-               char    *a1, 
+               char    *a1,
                int     z)
                { return(*(int *)0); }
 
@@ -470,7 +618,7 @@ int getstr(
 
 #undef hline
 int    hline(
-               chtype  a1, 
+               chtype  a1,
                int     z)
                { return(*(int *)0); }
 
@@ -480,7 +628,7 @@ chtype      inch(void)
 
 #undef inchnstr
 int    inchnstr(
-               chtype  *a1, 
+               chtype  *a1,
                int     z)
                { return(*(int *)0); }
 
@@ -491,7 +639,7 @@ int inchstr(
 
 #undef innstr
 int    innstr(
-               char    *a1, 
+               char    *a1,
                int     z)
                { return(*(int *)0); }
 
@@ -511,7 +659,7 @@ int insertln(void)
 
 #undef insnstr
 int    insnstr(
-               const char *a1, 
+               const char *a1,
                int     z)
                { return(*(int *)0); }
 
@@ -527,323 +675,323 @@ int     instr(
 
 #undef move
 int    move(
-               int     a1, 
+               int     a1,
                int     z)
                { return(*(int *)0); }
 
 #undef mvaddch
 int    mvaddch(
-               int     a1, 
-               int     a2, 
+               int     a1,
+               int     a2,
                const chtype z)
                { return(*(int *)0); }
 
 #undef mvaddchnstr
 int    mvaddchnstr(
-               int     a1, 
-               int     a2, 
-               const chtype *a3, 
+               int     a1,
+               int     a2,
+               const chtype *a3,
                int     z)
                { return(*(int *)0); }
 
 #undef mvaddchstr
 int    mvaddchstr(
-               int     a1, 
-               int     a2, 
+               int     a1,
+               int     a2,
                const chtype *z)
                { return(*(int *)0); }
 
 #undef mvaddnstr
 int    mvaddnstr(
-               int     a1, 
-               int     a2, 
-               const char *a3, 
+               int     a1,
+               int     a2,
+               const char *a3,
                int     z)
                { return(*(int *)0); }
 
 #undef mvaddstr
 int    mvaddstr(
-               int     a1, 
-               int     a2, 
+               int     a1,
+               int     a2,
                const char *z)
                { return(*(int *)0); }
 
 #undef mvchgat
 int    mvchgat(
-               int     a1, 
-               int     a2, 
-               int     a3, 
-               attr_t  a4, 
-               short   a5, 
+               int     a1,
+               int     a2,
+               int     a3,
+               attr_t  a4,
+               short   a5,
                const void *z)
                { return(*(int *)0); }
 
 #undef mvdelch
 int    mvdelch(
-               int     a1, 
+               int     a1,
                int     z)
                { return(*(int *)0); }
 
 #undef mvgetch
 int    mvgetch(
-               int     a1, 
+               int     a1,
                int     z)
                { return(*(int *)0); }
 
 #undef mvgetnstr
 int    mvgetnstr(
-               int     a1, 
-               int     a2, 
-               char    *a3, 
+               int     a1,
+               int     a2,
+               char    *a3,
                int     z)
                { return(*(int *)0); }
 
 #undef mvgetstr
 int    mvgetstr(
-               int     a1, 
-               int     a2, 
+               int     a1,
+               int     a2,
                char    *z)
                { return(*(int *)0); }
 
 #undef mvhline
 int    mvhline(
-               int     a1, 
-               int     a2, 
-               chtype  a3, 
+               int     a1,
+               int     a2,
+               chtype  a3,
                int     z)
                { return(*(int *)0); }
 
 #undef mvinch
 chtype mvinch(
-               int     a1, 
+               int     a1,
                int     z)
                { return(*(chtype *)0); }
 
 #undef mvinchnstr
 int    mvinchnstr(
-               int     a1, 
-               int     a2, 
-               chtype  *a3, 
+               int     a1,
+               int     a2,
+               chtype  *a3,
                int     z)
                { return(*(int *)0); }
 
 #undef mvinchstr
 int    mvinchstr(
-               int     a1, 
-               int     a2, 
+               int     a1,
+               int     a2,
                chtype  *z)
                { return(*(int *)0); }
 
 #undef mvinnstr
 int    mvinnstr(
-               int     a1, 
-               int     a2, 
-               char    *a3, 
+               int     a1,
+               int     a2,
+               char    *a3,
                int     z)
                { return(*(int *)0); }
 
 #undef mvinsch
 int    mvinsch(
-               int     a1, 
-               int     a2, 
+               int     a1,
+               int     a2,
                chtype  z)
                { return(*(int *)0); }
 
 #undef mvinsnstr
 int    mvinsnstr(
-               int     a1, 
-               int     a2, 
-               const char *a3, 
+               int     a1,
+               int     a2,
+               const char *a3,
                int     z)
                { return(*(int *)0); }
 
 #undef mvinsstr
 int    mvinsstr(
-               int     a1, 
-               int     a2, 
+               int     a1,
+               int     a2,
                const char *z)
                { return(*(int *)0); }
 
 #undef mvinstr
 int    mvinstr(
-               int     a1, 
-               int     a2, 
+               int     a1,
+               int     a2,
                char    *z)
                { return(*(int *)0); }
 
 #undef mvvline
 int    mvvline(
-               int     a1, 
-               int     a2, 
-               chtype  a3, 
+               int     a1,
+               int     a2,
+               chtype  a3,
                int     z)
                { return(*(int *)0); }
 
 #undef mvwaddch
 int    mvwaddch(
-               WINDOW  *a1, 
-               int     a2, 
-               int     a3, 
+               WINDOW  *a1,
+               int     a2,
+               int     a3,
                const chtype z)
                { return(*(int *)0); }
 
 #undef mvwaddchnstr
 int    mvwaddchnstr(
-               WINDOW  *a1, 
-               int     a2, 
-               int     a3, 
-               const chtype *a4, 
+               WINDOW  *a1,
+               int     a2,
+               int     a3,
+               const chtype *a4,
                int     z)
                { return(*(int *)0); }
 
 #undef mvwaddchstr
 int    mvwaddchstr(
-               WINDOW  *a1, 
-               int     a2, 
-               int     a3, 
+               WINDOW  *a1,
+               int     a2,
+               int     a3,
                const chtype *z)
                { return(*(int *)0); }
 
 #undef mvwaddnstr
 int    mvwaddnstr(
-               WINDOW  *a1, 
-               int     a2, 
-               int     a3, 
-               const char *a4, 
+               WINDOW  *a1,
+               int     a2,
+               int     a3,
+               const char *a4,
                int     z)
                { return(*(int *)0); }
 
 #undef mvwaddstr
 int    mvwaddstr(
-               WINDOW  *a1, 
-               int     a2, 
-               int     a3, 
+               WINDOW  *a1,
+               int     a2,
+               int     a3,
                const char *z)
                { return(*(int *)0); }
 
 #undef mvwchgat
 int    mvwchgat(
-               WINDOW  *a1, 
-               int     a2, 
-               int     a3, 
-               int     a4, 
-               attr_t  a5, 
-               short   a6, 
+               WINDOW  *a1,
+               int     a2,
+               int     a3,
+               int     a4,
+               attr_t  a5,
+               short   a6,
                const void *z)
                { return(*(int *)0); }
 
 #undef mvwdelch
 int    mvwdelch(
-               WINDOW  *a1, 
-               int     a2, 
+               WINDOW  *a1,
+               int     a2,
                int     z)
                { return(*(int *)0); }
 
 #undef mvwgetch
 int    mvwgetch(
-               WINDOW  *a1, 
-               int     a2, 
+               WINDOW  *a1,
+               int     a2,
                int     z)
                { return(*(int *)0); }
 
 #undef mvwgetnstr
 int    mvwgetnstr(
-               WINDOW  *a1, 
-               int     a2, 
-               int     a3, 
-               char    *a4, 
+               WINDOW  *a1,
+               int     a2,
+               int     a3,
+               char    *a4,
                int     z)
                { return(*(int *)0); }
 
 #undef mvwgetstr
 int    mvwgetstr(
-               WINDOW  *a1, 
-               int     a2, 
-               int     a3, 
+               WINDOW  *a1,
+               int     a2,
+               int     a3,
                char    *z)
                { return(*(int *)0); }
 
 #undef mvwhline
 int    mvwhline(
-               WINDOW  *a1, 
-               int     a2, 
-               int     a3, 
-               chtype  a4, 
+               WINDOW  *a1,
+               int     a2,
+               int     a3,
+               chtype  a4,
                int     z)
                { return(*(int *)0); }
 
 #undef mvwinch
 chtype mvwinch(
-               WINDOW  *a1, 
-               int     a2, 
+               WINDOW  *a1,
+               int     a2,
                int     z)
                { return(*(chtype *)0); }
 
 #undef mvwinchnstr
 int    mvwinchnstr(
-               WINDOW  *a1, 
-               int     a2, 
-               int     a3, 
-               chtype  *a4, 
+               WINDOW  *a1,
+               int     a2,
+               int     a3,
+               chtype  *a4,
                int     z)
                { return(*(int *)0); }
 
 #undef mvwinchstr
 int    mvwinchstr(
-               WINDOW  *a1, 
-               int     a2, 
-               int     a3, 
+               WINDOW  *a1,
+               int     a2,
+               int     a3,
                chtype  *z)
                { return(*(int *)0); }
 
 #undef mvwinnstr
 int    mvwinnstr(
-               WINDOW  *a1, 
-               int     a2, 
-               int     a3, 
-               char    *a4, 
+               WINDOW  *a1,
+               int     a2,
+               int     a3,
+               char    *a4,
                int     z)
                { return(*(int *)0); }
 
 #undef mvwinsch
 int    mvwinsch(
-               WINDOW  *a1, 
-               int     a2, 
-               int     a3, 
+               WINDOW  *a1,
+               int     a2,
+               int     a3,
                chtype  z)
                { return(*(int *)0); }
 
 #undef mvwinsnstr
 int    mvwinsnstr(
-               WINDOW  *a1, 
-               int     a2, 
-               int     a3, 
-               const char *a4, 
+               WINDOW  *a1,
+               int     a2,
+               int     a3,
+               const char *a4,
                int     z)
                { return(*(int *)0); }
 
 #undef mvwinsstr
 int    mvwinsstr(
-               WINDOW  *a1, 
-               int     a2, 
-               int     a3, 
+               WINDOW  *a1,
+               int     a2,
+               int     a3,
                const char *z)
                { return(*(int *)0); }
 
 #undef mvwinstr
 int    mvwinstr(
-               WINDOW  *a1, 
-               int     a2, 
-               int     a3, 
+               WINDOW  *a1,
+               int     a2,
+               int     a3,
                char    *z)
                { return(*(int *)0); }
 
 #undef mvwvline
 int    mvwvline(
-               WINDOW  *a1, 
-               int     a2, 
-               int     a3, 
-               chtype  a4, 
+               WINDOW  *a1,
+               int     a2,
+               int     a3,
+               chtype  a4,
                int     z)
                { return(*(int *)0); }
 
@@ -873,7 +1021,7 @@ int        scroll(
 
 #undef setscrreg
 int    setscrreg(
-               int     a1, 
+               int     a1,
                int     z)
                { return(*(int *)0); }
 
@@ -892,8 +1040,8 @@ void       timeout(
 
 #undef touchline
 int    touchline(
-               WINDOW  *a1, 
-               int     a2, 
+               WINDOW  *a1,
+               int     a2,
                int     z)
                { return(*(int *)0); }
 
@@ -909,67 +1057,53 @@ int      untouchwin(
 
 #undef vline
 int    vline(
-               chtype  a1, 
+               chtype  a1,
                int     z)
                { return(*(int *)0); }
 
-#undef vw_printw
-int    vw_printw(
-               WINDOW  *a1, 
-               const char *a2, 
-               va_list z)
-               { return(*(int *)0); }
-
-#undef vw_scanw
-int    vw_scanw(
-               WINDOW  *a1, 
-               char    *a2, 
-               va_list z)
-               { return(*(int *)0); }
-
 #undef waddchstr
 int    waddchstr(
-               WINDOW  *a1, 
+               WINDOW  *a1,
                const chtype *z)
                { return(*(int *)0); }
 
 #undef waddstr
 int    waddstr(
-               WINDOW  *a1, 
+               WINDOW  *a1,
                const char *z)
                { return(*(int *)0); }
 
 #undef wattron
 int    wattron(
-               WINDOW  *a1, 
+               WINDOW  *a1,
                int     z)
                { return(*(int *)0); }
 
 #undef wattroff
 int    wattroff(
-               WINDOW  *a1, 
+               WINDOW  *a1,
                int     z)
                { return(*(int *)0); }
 
 #undef wattrset
 int    wattrset(
-               WINDOW  *a1, 
+               WINDOW  *a1,
                int     z)
                { return(*(int *)0); }
 
 #undef wattr_get
 int    wattr_get(
-               WINDOW  *a1, 
-               attr_t  *a2, 
-               short   *a3, 
+               WINDOW  *a1,
+               attr_t  *a2,
+               short   *a3,
                void    *z)
                { return(*(int *)0); }
 
 #undef wattr_set
 int    wattr_set(
-               WINDOW  *a1, 
-               attr_t  a2, 
-               short   a3, 
+               WINDOW  *a1,
+               attr_t  a2,
+               short   a3,
                void    *z)
                { return(*(int *)0); }
 
@@ -980,13 +1114,13 @@ int      wdeleteln(
 
 #undef wgetstr
 int    wgetstr(
-               WINDOW  *a1, 
+               WINDOW  *a1,
                char    *z)
                { return(*(int *)0); }
 
 #undef winchstr
 int    winchstr(
-               WINDOW  *a1, 
+               WINDOW  *a1,
                chtype  *z)
                { return(*(int *)0); }
 
@@ -997,13 +1131,13 @@ int      winsertln(
 
 #undef winsstr
 int    winsstr(
-               WINDOW  *a1, 
+               WINDOW  *a1,
                const char *z)
                { return(*(int *)0); }
 
 #undef winstr
 int    winstr(
-               WINDOW  *a1, 
+               WINDOW  *a1,
                char    *z)
                { return(*(int *)0); }
 
@@ -1107,41 +1241,74 @@ NCURSES_BOOL is_notimeout(
                const WINDOW *z)
                { return(*(NCURSES_BOOL *)0); }
 
+#undef is_pad
+NCURSES_BOOL is_pad(
+               const WINDOW *z)
+               { return(*(NCURSES_BOOL *)0); }
+
 #undef is_scrollok
 NCURSES_BOOL is_scrollok(
                const WINDOW *z)
                { return(*(NCURSES_BOOL *)0); }
 
+#undef is_subwin
+NCURSES_BOOL is_subwin(
+               const WINDOW *z)
+               { return(*(NCURSES_BOOL *)0); }
+
 #undef is_syncok
 NCURSES_BOOL is_syncok(
                const WINDOW *z)
                { return(*(NCURSES_BOOL *)0); }
 
+#undef wgetdelay
+int    wgetdelay(
+               const WINDOW *z)
+               { return(*(int *)0); }
+
 #undef wgetscrreg
 int    wgetscrreg(
-               const WINDOW *a1, 
-               int     *a2, 
+               const WINDOW *a1,
+               int     *a2,
                int     *z)
                { return(*(int *)0); }
 
 #undef mouse_trafo
 NCURSES_BOOL mouse_trafo(
-               int     *a1, 
-               int     *a2, 
-               NCURSES_BOOL    z)
+               int     *a1,
+               int     *a2,
+               NCURSES_BOOL z)
                { return(*(NCURSES_BOOL *)0); }
 
 /* ./base/lib_getch.c */
 
-#include <fifo_defs.h>
-
 #undef ESCDELAY
 int    ESCDELAY;
 
+#undef set_escdelay_sp
+int    set_escdelay_sp(
+               SCREEN  *sp,
+               int     value)
+               { return(*(int *)0); }
+
+#undef set_escdelay
+int    set_escdelay(
+               int     value)
+               { return(*(int *)0); }
+
+#undef get_escdelay_sp
+int    get_escdelay_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
+#undef get_escdelay
+int    get_escdelay(void)
+               { return(*(int *)0); }
+
 #undef _nc_wgetch
 int    _nc_wgetch(
-               WINDOW  *win, 
-               unsigned long *result, 
+               WINDOW  *win,
+               int     *result,
                int     use_meta)
                { return(*(int *)0); }
 
@@ -1154,8 +1321,8 @@ int       wgetch(
 
 #undef wgetnstr
 int    wgetnstr(
-               WINDOW  *win, 
-               char    *str, 
+               WINDOW  *win,
+               char    *str,
                int     maxlen)
                { return(*(int *)0); }
 
@@ -1163,8 +1330,8 @@ int       wgetnstr(
 
 #undef whline
 int    whline(
-               WINDOW  *win, 
-               chtype  ch, 
+               WINDOW  *win,
+               chtype  ch,
                int     n)
                { return(*(int *)0); }
 
@@ -1172,7 +1339,7 @@ int       whline(
 
 #undef immedok
 void   immedok(
-               WINDOW  *win, 
+               WINDOW  *win,
                NCURSES_BOOL flag)
                { /* void */ }
 
@@ -1180,8 +1347,8 @@ void      immedok(
 
 #undef winchnstr
 int    winchnstr(
-               WINDOW  *win, 
-               chtype  *str, 
+               WINDOW  *win,
+               chtype  *str,
                int     n)
                { return(*(int *)0); }
 
@@ -1195,13 +1362,14 @@ WINDOW  *initscr(void)
 
 #undef _nc_insert_ch
 int    _nc_insert_ch(
-               WINDOW  *win, 
+               SCREEN  *sp,
+               WINDOW  *win,
                chtype  ch)
                { return(*(int *)0); }
 
 #undef winsch
 int    winsch(
-               WINDOW  *win, 
+               WINDOW  *win,
                chtype  c)
                { return(*(int *)0); }
 
@@ -1209,7 +1377,7 @@ int       winsch(
 
 #undef winsdelln
 int    winsdelln(
-               WINDOW  *win, 
+               WINDOW  *win,
                int     n)
                { return(*(int *)0); }
 
@@ -1217,8 +1385,8 @@ int       winsdelln(
 
 #undef winsnstr
 int    winsnstr(
-               WINDOW  *win, 
-               const char *s, 
+               WINDOW  *win,
+               const char *s,
                int     n)
                { return(*(int *)0); }
 
@@ -1226,13 +1394,18 @@ int     winsnstr(
 
 #undef winnstr
 int    winnstr(
-               WINDOW  *win, 
-               char    *str, 
+               WINDOW  *win,
+               char    *str,
                int     n)
                { return(*(int *)0); }
 
 /* ./base/lib_isendwin.c */
 
+#undef isendwin_sp
+NCURSES_BOOL isendwin_sp(
+               SCREEN  *sp)
+               { return(*(NCURSES_BOOL *)0); }
+
 #undef isendwin
 NCURSES_BOOL isendwin(void)
                { return(*(NCURSES_BOOL *)0); }
@@ -1241,49 +1414,84 @@ NCURSES_BOOL isendwin(void)
 
 #undef leaveok
 int    leaveok(
-               WINDOW  *win, 
+               WINDOW  *win,
                NCURSES_BOOL flag)
                { return(*(int *)0); }
 
 /* ./base/lib_mouse.c */
 
+#undef getmouse_sp
+int    getmouse_sp(
+               SCREEN  *sp,
+               MEVENT  *aevent)
+               { return(*(int *)0); }
+
 #undef getmouse
 int    getmouse(
                MEVENT  *aevent)
                { return(*(int *)0); }
 
+#undef ungetmouse_sp
+int    ungetmouse_sp(
+               SCREEN  *sp,
+               MEVENT  *aevent)
+               { return(*(int *)0); }
+
 #undef ungetmouse
 int    ungetmouse(
                MEVENT  *aevent)
                { return(*(int *)0); }
 
+#undef mousemask_sp
+mmask_t        mousemask_sp(
+               SCREEN  *sp,
+               mmask_t newmask,
+               mmask_t *oldmask)
+               { return(*(mmask_t *)0); }
+
 #undef mousemask
 mmask_t        mousemask(
-               mmask_t newmask, 
+               mmask_t newmask,
                mmask_t *oldmask)
                { return(*(mmask_t *)0); }
 
 #undef wenclose
 NCURSES_BOOL wenclose(
-               const WINDOW *win, 
-               int     y, 
+               const WINDOW *win,
+               int     y,
                int     x)
                { return(*(NCURSES_BOOL *)0); }
 
+#undef mouseinterval_sp
+int    mouseinterval_sp(
+               SCREEN  *sp,
+               int     maxclick)
+               { return(*(int *)0); }
+
 #undef mouseinterval
 int    mouseinterval(
                int     maxclick)
                { return(*(int *)0); }
 
 #undef _nc_has_mouse
-int    _nc_has_mouse(void)
-               { return(*(int *)0); }
+NCURSES_BOOL _nc_has_mouse(
+               SCREEN  *sp)
+               { return(*(NCURSES_BOOL *)0); }
+
+#undef has_mouse_sp
+NCURSES_BOOL has_mouse_sp(
+               SCREEN  *sp)
+               { return(*(NCURSES_BOOL *)0); }
+
+#undef has_mouse
+NCURSES_BOOL has_mouse(void)
+               { return(*(NCURSES_BOOL *)0); }
 
 #undef wmouse_trafo
 NCURSES_BOOL wmouse_trafo(
-               const WINDOW *win, 
-               int     *pY, 
-               int     *pX, 
+               const WINDOW *win,
+               int     *pY,
+               int     *pX,
                NCURSES_BOOL to_screen)
                { return(*(NCURSES_BOOL *)0); }
 
@@ -1291,36 +1499,84 @@ NCURSES_BOOL wmouse_trafo(
 
 #undef wmove
 int    wmove(
-               WINDOW  *win, 
-               int     y, 
+               WINDOW  *win,
+               int     y,
                int     x)
                { return(*(int *)0); }
 
 /* ./tty/lib_mvcur.c */
 
+#undef _nc_msec_cost_sp
+int    _nc_msec_cost_sp(
+               SCREEN  *sp,
+               const char *const cap,
+               int     affcnt)
+               { return(*(int *)0); }
+
 #undef _nc_msec_cost
 int    _nc_msec_cost(
-               const char *const cap, 
+               const char *const cap,
                int     affcnt)
                { return(*(int *)0); }
 
+#undef _nc_mvcur_resume_sp
+void   _nc_mvcur_resume_sp(
+               SCREEN  *sp)
+               { /* void */ }
+
 #undef _nc_mvcur_resume
 void   _nc_mvcur_resume(void)
                { /* void */ }
 
+#undef _nc_mvcur_init_sp
+void   _nc_mvcur_init_sp(
+               SCREEN  *sp)
+               { /* void */ }
+
 #undef _nc_mvcur_init
 void   _nc_mvcur_init(void)
                { /* void */ }
 
+#undef _nc_mvcur_wrap_sp
+void   _nc_mvcur_wrap_sp(
+               SCREEN  *sp)
+               { /* void */ }
+
 #undef _nc_mvcur_wrap
 void   _nc_mvcur_wrap(void)
                { /* void */ }
 
+#undef _nc_mvcur_sp
+int    _nc_mvcur_sp(
+               SCREEN  *sp,
+               int     yold,
+               int     xold,
+               int     ynew,
+               int     xnew)
+               { return(*(int *)0); }
+
+#undef _nc_mvcur
+int    _nc_mvcur(
+               int     yold,
+               int     xold,
+               int     ynew,
+               int     xnew)
+               { return(*(int *)0); }
+
+#undef mvcur_sp
+int    mvcur_sp(
+               SCREEN  *sp,
+               int     yold,
+               int     xold,
+               int     ynew,
+               int     xnew)
+               { return(*(int *)0); }
+
 #undef mvcur
 int    mvcur(
-               int     yold, 
-               int     xold, 
-               int     ynew, 
+               int     yold,
+               int     xold,
+               int     ynew,
                int     xnew)
                { return(*(int *)0); }
 
@@ -1331,25 +1587,43 @@ int     _nc_optimize_enable;
 
 #undef mvwin
 int    mvwin(
-               WINDOW  *win, 
-               int     by, 
+               WINDOW  *win,
+               int     by,
                int     bx)
                { return(*(int *)0); }
 
 /* ./base/lib_newterm.c */
 
+#undef filter_sp
+void   filter_sp(
+               SCREEN  *sp)
+               { /* void */ }
+
 #undef filter
 void   filter(void)
                { /* void */ }
 
+#undef nofilter_sp
+void   nofilter_sp(
+               SCREEN  *sp)
+               { /* void */ }
+
 #undef nofilter
 void   nofilter(void)
                { /* void */ }
 
+#undef newterm_sp
+SCREEN *newterm_sp(
+               SCREEN  *sp,
+               const char *name,
+               FILE    *ofp,
+               FILE    *ifp)
+               { return(*(SCREEN **)0); }
+
 #undef newterm
 SCREEN *newterm(
-               char    *name, 
-               FILE    *ofp, 
+               const char *name,
+               FILE    *ofp,
                FILE    *ifp)
                { return(*(SCREEN **)0); }
 
@@ -1360,47 +1634,82 @@ int     _nc_freewin(
                WINDOW  *win)
                { return(*(int *)0); }
 
+#undef newwin_sp
+WINDOW *newwin_sp(
+               SCREEN  *sp,
+               int     num_lines,
+               int     num_columns,
+               int     begy,
+               int     begx)
+               { return(*(WINDOW **)0); }
+
 #undef newwin
 WINDOW *newwin(
-               int     num_lines, 
-               int     num_columns, 
-               int     begy, 
+               int     num_lines,
+               int     num_columns,
+               int     begy,
                int     begx)
                { return(*(WINDOW **)0); }
 
 #undef derwin
 WINDOW *derwin(
-               WINDOW  *orig, 
-               int     num_lines, 
-               int     num_columns, 
-               int     begy, 
+               WINDOW  *orig,
+               int     num_lines,
+               int     num_columns,
+               int     begy,
                int     begx)
                { return(*(WINDOW **)0); }
 
 #undef subwin
 WINDOW *subwin(
-               WINDOW  *w, 
-               int     l, 
-               int     c, 
-               int     y, 
+               WINDOW  *w,
+               int     l,
+               int     c,
+               int     y,
                int     x)
                { return(*(WINDOW **)0); }
 
-#undef _nc_makenew
-WINDOW *_nc_makenew(
-               int     num_lines, 
-               int     num_columns, 
-               int     begy, 
-               int     begx, 
+#undef _nc_makenew_sp
+WINDOW *_nc_makenew_sp(
+               SCREEN  *sp,
+               int     num_lines,
+               int     num_columns,
+               int     begy,
+               int     begx,
                int     flags)
                { return(*(WINDOW **)0); }
 
+#undef _nc_curscr_of
+WINDOW *_nc_curscr_of(
+               SCREEN  *sp)
+               { return(*(WINDOW **)0); }
+
+#undef _nc_newscr_of
+WINDOW *_nc_newscr_of(
+               SCREEN  *sp)
+               { return(*(WINDOW **)0); }
+
+#undef _nc_stdscr_of
+WINDOW *_nc_stdscr_of(
+               SCREEN  *sp)
+               { return(*(WINDOW **)0); }
+
 /* ./base/lib_nl.c */
 
+#undef nl_sp
+int    nl_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef nl
 int    nl(void)
                { return(*(int *)0); }
 
+#undef nonl_sp
+int    nonl_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef nonl
 int    nonl(void)
                { return(*(int *)0); }
@@ -1409,71 +1718,78 @@ int     nonl(void)
 
 #undef overlay
 int    overlay(
-               const WINDOW *win1, 
+               const WINDOW *win1,
                WINDOW  *win2)
                { return(*(int *)0); }
 
 #undef overwrite
 int    overwrite(
-               const WINDOW *win1, 
+               const WINDOW *win1,
                WINDOW  *win2)
                { return(*(int *)0); }
 
 #undef copywin
 int    copywin(
-               const WINDOW *src, 
-               WINDOW  *dst, 
-               int     sminrow, 
-               int     smincol, 
-               int     dminrow, 
-               int     dmincol, 
-               int     dmaxrow, 
-               int     dmaxcol, 
+               const WINDOW *src,
+               WINDOW  *dst,
+               int     sminrow,
+               int     smincol,
+               int     dminrow,
+               int     dmincol,
+               int     dmaxrow,
+               int     dmaxcol,
                int     over)
                { return(*(int *)0); }
 
 /* ./base/lib_pad.c */
 
+#undef newpad_sp
+WINDOW *newpad_sp(
+               SCREEN  *sp,
+               int     l,
+               int     c)
+               { return(*(WINDOW **)0); }
+
 #undef newpad
 WINDOW *newpad(
-               int     l, 
+               int     l,
                int     c)
                { return(*(WINDOW **)0); }
 
 #undef subpad
 WINDOW *subpad(
-               WINDOW  *orig, 
-               int     l, 
-               int     c, 
-               int     begy, 
+               WINDOW  *orig,
+               int     l,
+               int     c,
+               int     begy,
                int     begx)
                { return(*(WINDOW **)0); }
 
 #undef prefresh
 int    prefresh(
-               WINDOW  *win, 
-               int     pminrow, 
-               int     pmincol, 
-               int     sminrow, 
-               int     smincol, 
-               int     smaxrow, 
+               WINDOW  *win,
+               int     pminrow,
+               int     pmincol,
+               int     sminrow,
+               int     smincol,
+               int     smaxrow,
                int     smaxcol)
                { return(*(int *)0); }
 
 #undef pnoutrefresh
 int    pnoutrefresh(
-               WINDOW  *win, 
-               int     pminrow, 
-               int     pmincol, 
-               int     sminrow, 
-               int     smincol, 
-               int     smaxrow, 
+               WINDOW  *win,
+               int     pminrow,
+               int     pmincol,
+               int     sminrow,
+               int     smincol,
+               int     smaxrow,
                int     smaxcol)
                { return(*(int *)0); }
 
 #undef pechochar
 int    pechochar(
-               WINDOW  *pad, 
+               WINDOW  *pad,
                const chtype ch)
                { return(*(int *)0); }
 
@@ -1481,38 +1797,45 @@ int     pechochar(
 
 #undef printw
 int    printw(
-               const char *fmt, 
+               const char *fmt,
                ...)
                { return(*(int *)0); }
 
 #undef wprintw
 int    wprintw(
-               WINDOW  *win, 
-               const char *fmt, 
+               WINDOW  *win,
+               const char *fmt,
                ...)
                { return(*(int *)0); }
 
 #undef mvprintw
 int    mvprintw(
-               int     y, 
-               int     x, 
-               const char *fmt, 
+               int     y,
+               int     x,
+               const char *fmt,
                ...)
                { return(*(int *)0); }
 
 #undef mvwprintw
 int    mvwprintw(
-               WINDOW  *win, 
-               int     y, 
-               int     x, 
-               const char *fmt, 
+               WINDOW  *win,
+               int     y,
+               int     x,
+               const char *fmt,
                ...)
                { return(*(int *)0); }
 
 #undef vwprintw
 int    vwprintw(
-               WINDOW  *win, 
-               const char *fmt, 
+               WINDOW  *win,
+               const char *fmt,
+               va_list argp)
+               { return(*(int *)0); }
+
+#undef vw_printw
+int    vw_printw(
+               WINDOW  *win,
+               const char *fmt,
                va_list argp)
                { return(*(int *)0); }
 
@@ -1520,8 +1843,8 @@ int       vwprintw(
 
 #undef wredrawln
 int    wredrawln(
-               WINDOW  *win, 
-               int     beg, 
+               WINDOW  *win,
+               int     beg,
                int     num)
                { return(*(int *)0); }
 
@@ -1539,10 +1862,18 @@ int     wnoutrefresh(
 
 /* ./base/lib_restart.c */
 
+#undef restartterm_sp
+int    restartterm_sp(
+               SCREEN  *sp,
+               const char *termp,
+               int     filenum,
+               int     *errret)
+               { return(*(int *)0); }
+
 #undef restartterm
 int    restartterm(
-               char    *termp, 
-               int     filenum, 
+               const char *termp,
+               int     filenum,
                int     *errret)
                { return(*(int *)0); }
 
@@ -1550,43 +1881,56 @@ int     restartterm(
 
 #undef vwscanw
 int    vwscanw(
-               WINDOW  *win, 
-               char    *fmt, 
+               WINDOW  *win,
+               const char *fmt,
+               va_list argp)
+               { return(*(int *)0); }
+
+#undef vw_scanw
+int    vw_scanw(
+               WINDOW  *win,
+               const char *fmt,
                va_list argp)
                { return(*(int *)0); }
 
 #undef scanw
 int    scanw(
-               char    *fmt, 
+               const char *fmt,
                ...)
                { return(*(int *)0); }
 
 #undef wscanw
 int    wscanw(
-               WINDOW  *win, 
-               char    *fmt, 
+               WINDOW  *win,
+               const char *fmt,
                ...)
                { return(*(int *)0); }
 
 #undef mvscanw
 int    mvscanw(
-               int     y, 
-               int     x, 
-               char    *fmt, 
+               int     y,
+               int     x,
+               const char *fmt,
                ...)
                { return(*(int *)0); }
 
 #undef mvwscanw
 int    mvwscanw(
-               WINDOW  *win, 
-               int     y, 
-               int     x, 
-               char    *fmt, 
+               WINDOW  *win,
+               int     y,
+               int     x,
+               const char *fmt,
                ...)
                { return(*(int *)0); }
 
 /* ./base/lib_screen.c */
 
+#undef getwin_sp
+WINDOW *getwin_sp(
+               SCREEN  *sp,
+               FILE    *filep)
+               { return(*(WINDOW **)0); }
+
 #undef getwin
 WINDOW *getwin(
                FILE    *filep)
@@ -1594,10 +1938,16 @@ WINDOW  *getwin(
 
 #undef putwin
 int    putwin(
-               WINDOW  *win, 
+               WINDOW  *win,
                FILE    *filep)
                { return(*(int *)0); }
 
+#undef scr_restore_sp
+int    scr_restore_sp(
+               SCREEN  *sp,
+               const char *file)
+               { return(*(int *)0); }
+
 #undef scr_restore
 int    scr_restore(
                const char *file)
@@ -1608,11 +1958,23 @@ int     scr_dump(
                const char *file)
                { return(*(int *)0); }
 
+#undef scr_init_sp
+int    scr_init_sp(
+               SCREEN  *sp,
+               const char *file)
+               { return(*(int *)0); }
+
 #undef scr_init
 int    scr_init(
                const char *file)
                { return(*(int *)0); }
 
+#undef scr_set_sp
+int    scr_set_sp(
+               SCREEN  *sp,
+               const char *file)
+               { return(*(int *)0); }
+
 #undef scr_set
 int    scr_set(
                const char *file)
@@ -1622,16 +1984,16 @@ int     scr_set(
 
 #undef _nc_scroll_window
 void   _nc_scroll_window(
-               WINDOW  *win, 
-               int const n, 
-               short const top, 
-               short const bottom, 
+               WINDOW  *win,
+               int const n,
+               int const top,
+               int const bottom,
                chtype  blank)
                { /* void */ }
 
 #undef wscrl
 int    wscrl(
-               WINDOW  *win, 
+               WINDOW  *win,
                int     n)
                { return(*(int *)0); }
 
@@ -1639,7 +2001,7 @@ int       wscrl(
 
 #undef scrollok
 int    scrollok(
-               WINDOW  *win, 
+               WINDOW  *win,
                NCURSES_BOOL flag)
                { return(*(int *)0); }
 
@@ -1647,8 +2009,8 @@ int       scrollok(
 
 #undef wsetscrreg
 int    wsetscrreg(
-               WINDOW  *win, 
-               int     top, 
+               WINDOW  *win,
+               int     top,
                int     bottom)
                { return(*(int *)0); }
 
@@ -1664,57 +2026,107 @@ void   delscreen(
                SCREEN  *sp)
                { /* void */ }
 
+#undef _nc_setupscreen_sp
+int    _nc_setupscreen_sp(
+               SCREEN  **spp,
+               int     slines,
+               int     scolumns,
+               FILE    *output,
+               int     filtered,
+               int     slk_format)
+               { return(*(int *)0); }
+
 #undef _nc_setupscreen
 int    _nc_setupscreen(
-               int     slines, 
-               int     scolumns, 
-               FILE    *output, 
-               NCURSES_BOOL filtered, 
+               int     slines,
+               int     scolumns,
+               FILE    *output,
+               int     filtered,
                int     slk_format)
                { return(*(int *)0); }
 
+#undef _nc_ripoffline_sp
+int    _nc_ripoffline_sp(
+               SCREEN  *sp,
+               int     line,
+               int     (*init)(
+               WINDOW  *p1,
+               int     p2))
+               { return(*(int *)0); }
+
 #undef _nc_ripoffline
 int    _nc_ripoffline(
-               int     line, 
+               int     line,
+               int     (*init)(
+               WINDOW  *p1,
+               int     p2))
+               { return(*(int *)0); }
+
+#undef ripoffline_sp
+int    ripoffline_sp(
+               SCREEN  *sp,
+               int     line,
                int     (*init)(
-               WINDOW  *p1, 
+               WINDOW  *p1,
                int     p2))
                { return(*(int *)0); }
 
 #undef ripoffline
 int    ripoffline(
-               int     line, 
+               int     line,
                int     (*init)(
-               WINDOW  *p1, 
+               WINDOW  *p1,
                int     p2))
                { return(*(int *)0); }
 
 /* ./base/lib_slk.c */
 
-#undef _nc_slk_format
-int    _nc_slk_format;
+#undef _nc_format_slks
+int    _nc_format_slks(
+               SCREEN  *sp,
+               int     cols)
+               { return(*(int *)0); }
 
 #undef _nc_slk_initialize
 int    _nc_slk_initialize(
-               WINDOW  *stwin, 
+               WINDOW  *stwin,
                int     cols)
                { return(*(int *)0); }
 
+#undef slk_restore_sp
+int    slk_restore_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef slk_restore
 int    slk_restore(void)
                { return(*(int *)0); }
 
 /* ./base/lib_slkatr_set.c */
 
+#undef slk_attr_set_sp
+int    slk_attr_set_sp(
+               SCREEN  *sp,
+               const attr_t attr,
+               short   pair_arg,
+               void    *opts)
+               { return(*(int *)0); }
+
 #undef slk_attr_set
 int    slk_attr_set(
-               const attr_t attr, 
-               short   color_pair_number, 
+               const attr_t attr,
+               short   pair_arg,
                void    *opts)
                { return(*(int *)0); }
 
 /* ./base/lib_slkatrof.c */
 
+#undef slk_attroff_sp
+int    slk_attroff_sp(
+               SCREEN  *sp,
+               const chtype attr)
+               { return(*(int *)0); }
+
 #undef slk_attroff
 int    slk_attroff(
                const chtype attr)
@@ -1722,6 +2134,12 @@ int      slk_attroff(
 
 /* ./base/lib_slkatron.c */
 
+#undef slk_attron_sp
+int    slk_attron_sp(
+               SCREEN  *sp,
+               const chtype attr)
+               { return(*(int *)0); }
+
 #undef slk_attron
 int    slk_attron(
                const chtype attr)
@@ -1729,6 +2147,12 @@ int      slk_attron(
 
 /* ./base/lib_slkatrset.c */
 
+#undef slk_attrset_sp
+int    slk_attrset_sp(
+               SCREEN  *sp,
+               const chtype attr)
+               { return(*(int *)0); }
+
 #undef slk_attrset
 int    slk_attrset(
                const chtype attr)
@@ -1736,25 +2160,47 @@ int     slk_attrset(
 
 /* ./base/lib_slkattr.c */
 
+#undef slk_attr_sp
+attr_t slk_attr_sp(
+               SCREEN  *sp)
+               { return(*(attr_t *)0); }
+
 #undef slk_attr
 attr_t slk_attr(void)
                { return(*(attr_t *)0); }
 
 /* ./base/lib_slkclear.c */
 
+#undef slk_clear_sp
+int    slk_clear_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef slk_clear
 int    slk_clear(void)
                { return(*(int *)0); }
 
 /* ./base/lib_slkcolor.c */
 
+#undef slk_color_sp
+int    slk_color_sp(
+               SCREEN  *sp,
+               short   pair_arg)
+               { return(*(int *)0); }
+
 #undef slk_color
 int    slk_color(
-               short   color_pair_number)
+               short   pair_arg)
                { return(*(int *)0); }
 
 /* ./base/lib_slkinit.c */
 
+#undef slk_init_sp
+int    slk_init_sp(
+               SCREEN  *sp,
+               int     format)
+               { return(*(int *)0); }
+
 #undef slk_init
 int    slk_init(
                int     format)
@@ -1762,6 +2208,12 @@ int      slk_init(
 
 /* ./base/lib_slklab.c */
 
+#undef slk_label_sp
+char   *slk_label_sp(
+               SCREEN  *sp,
+               int     n)
+               { return(*(char **)0); }
+
 #undef slk_label
 char   *slk_label(
                int     n)
@@ -1769,25 +2221,48 @@ char    *slk_label(
 
 /* ./base/lib_slkrefr.c */
 
+#undef slk_noutrefresh_sp
+int    slk_noutrefresh_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef slk_noutrefresh
 int    slk_noutrefresh(void)
                { return(*(int *)0); }
 
+#undef slk_refresh_sp
+int    slk_refresh_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef slk_refresh
 int    slk_refresh(void)
                { return(*(int *)0); }
 
 /* ./base/lib_slkset.c */
 
+#undef slk_set_sp
+int    slk_set_sp(
+               SCREEN  *sp,
+               int     i,
+               const char *astr,
+               int     format)
+               { return(*(int *)0); }
+
 #undef slk_set
 int    slk_set(
-               int     i, 
-               const char *astr, 
+               int     i,
+               const char *astr,
                int     format)
                { return(*(int *)0); }
 
 /* ./base/lib_slktouch.c */
 
+#undef slk_touch_sp
+int    slk_touch_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef slk_touch
 int    slk_touch(void)
                { return(*(int *)0); }
@@ -1796,7 +2271,7 @@ int       slk_touch(void)
 
 #undef is_linetouched
 NCURSES_BOOL is_linetouched(
-               WINDOW  *win, 
+               WINDOW  *win,
                int     line)
                { return(*(NCURSES_BOOL *)0); }
 
@@ -1807,9 +2282,9 @@ NCURSES_BOOL is_wintouched(
 
 #undef wtouchln
 int    wtouchln(
-               WINDOW  *win, 
-               int     y, 
-               int     n, 
+               WINDOW  *win,
+               int     y,
+               int     n,
                int     changed)
                { return(*(int *)0); }
 
@@ -1817,12 +2292,30 @@ int     wtouchln(
 
 #undef _tracedump
 void   _tracedump(
-               const char *name, 
+               const char *name,
                WINDOW  *win)
                { /* void */ }
 
 /* ./trace/lib_tracemse.c */
 
+#undef _nc_trace_mmask_t
+char   *_nc_trace_mmask_t(
+               SCREEN  *sp,
+               mmask_t code)
+               { return(*(char **)0); }
+
+#undef _nc_tracemouse
+char   *_nc_tracemouse(
+               SCREEN  *sp,
+               MEVENT const *ep)
+               { return(*(char **)0); }
+
+#undef _nc_retrace_mmask_t
+mmask_t        _nc_retrace_mmask_t(
+               SCREEN  *sp,
+               mmask_t code)
+               { return(*(mmask_t *)0); }
+
 #undef _tracemouse
 char   *_tracemouse(
                MEVENT const *ep)
@@ -1830,19 +2323,24 @@ char    *_tracemouse(
 
 /* ./tty/lib_tstp.c */
 
-#include <SigAction.h>
-
 #undef _nc_signal_handler
 void   _nc_signal_handler(
-               NCURSES_BOOL enable)
+               int     enable)
                { /* void */ }
 
 /* ./base/lib_ungetch.c */
 
 #undef _nc_fifo_dump
-void   _nc_fifo_dump(void)
+void   _nc_fifo_dump(
+               SCREEN  *sp)
                { /* void */ }
 
+#undef ungetch_sp
+int    ungetch_sp(
+               SCREEN  *sp,
+               int     ch)
+               { return(*(int *)0); }
+
 #undef ungetch
 int    ungetch(
                int     ch)
@@ -1850,11 +2348,23 @@ int     ungetch(
 
 /* ./tty/lib_vidattr.c */
 
+#undef vidputs_sp
+int    vidputs_sp(
+               SCREEN  *sp,
+               chtype  newmode,
+               NCURSES_OUTC_sp outc)
+               { return(*(int *)0); }
+
 #undef vidputs
 int    vidputs(
-               chtype  newmode, 
-               int     (*outc)(
-               int     p1))
+               chtype  newmode,
+               NCURSES_OUTC outc)
+               { return(*(int *)0); }
+
+#undef vidattr_sp
+int    vidattr_sp(
+               SCREEN  *sp,
+               chtype  newmode)
                { return(*(int *)0); }
 
 #undef vidattr
@@ -1862,6 +2372,11 @@ int      vidattr(
                chtype  newmode)
                { return(*(int *)0); }
 
+#undef termattrs_sp
+chtype termattrs_sp(
+               SCREEN  *sp)
+               { return(*(chtype *)0); }
+
 #undef termattrs
 chtype termattrs(void)
                { return(*(chtype *)0); }
@@ -1870,8 +2385,8 @@ chtype    termattrs(void)
 
 #undef wvline
 int    wvline(
-               WINDOW  *win, 
-               chtype  ch, 
+               WINDOW  *win,
+               chtype  ch,
                int     n)
                { return(*(int *)0); }
 
@@ -1879,8 +2394,8 @@ int       wvline(
 
 #undef wattr_off
 int    wattr_off(
-               WINDOW  *win, 
-               attr_t  at, 
+               WINDOW  *win,
+               attr_t  at,
                void    *opts)
                { return(*(int *)0); }
 
@@ -1888,8 +2403,8 @@ int       wattr_off(
 
 #undef wattr_on
 int    wattr_on(
-               WINDOW  *win, 
-               attr_t  at, 
+               WINDOW  *win,
+               attr_t  at,
                void    *opts)
                { return(*(int *)0); }
 
@@ -1909,14 +2424,14 @@ void    _nc_synchook(
 
 #undef mvderwin
 int    mvderwin(
-               WINDOW  *win, 
-               int     y, 
+               WINDOW  *win,
+               int     y,
                int     x)
                { return(*(int *)0); }
 
 #undef syncok
 int    syncok(
-               WINDOW  *win, 
+               WINDOW  *win,
                NCURSES_BOOL bf)
                { return(*(int *)0); }
 
@@ -1942,47 +2457,91 @@ WINDOW  *dupwin(
 
 /* ./base/nc_panel.c */
 
+#undef _nc_panelhook_sp
+struct panelhook *_nc_panelhook_sp(
+               SCREEN  *sp)
+               { return(*(struct panelhook **)0); }
+
 #undef _nc_panelhook
 struct panelhook *_nc_panelhook(void)
                { return(*(struct panelhook **)0); }
 
 /* ./base/safe_sprintf.c */
 
+#undef _nc_printf_string_sp
+char   *_nc_printf_string_sp(
+               SCREEN  *sp,
+               const char *fmt,
+               va_list ap)
+               { return(*(char **)0); }
+
 #undef _nc_printf_string
 char   *_nc_printf_string(
-               const char *fmt, 
+               const char *fmt,
                va_list ap)
                { return(*(char **)0); }
 
 /* ./tty/tty_update.c */
 
-#include <sys/time.h>
-#include <sys/times.h>
+#undef doupdate_sp
+int    doupdate_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
 
 #undef doupdate
 int    doupdate(void)
                { return(*(int *)0); }
 
+#undef _nc_scrolln_sp
+int    _nc_scrolln_sp(
+               SCREEN  *sp,
+               int     n,
+               int     top,
+               int     bot,
+               int     maxy)
+               { return(*(int *)0); }
+
 #undef _nc_scrolln
 int    _nc_scrolln(
-               int     n, 
-               int     top, 
-               int     bot, 
+               int     n,
+               int     top,
+               int     bot,
                int     maxy)
                { return(*(int *)0); }
 
+#undef _nc_screen_resume_sp
+void   _nc_screen_resume_sp(
+               SCREEN  *sp)
+               { /* void */ }
+
 #undef _nc_screen_resume
 void   _nc_screen_resume(void)
                { /* void */ }
 
+#undef _nc_screen_init_sp
+void   _nc_screen_init_sp(
+               SCREEN  *sp)
+               { /* void */ }
+
 #undef _nc_screen_init
 void   _nc_screen_init(void)
                { /* void */ }
 
+#undef _nc_screen_wrap_sp
+void   _nc_screen_wrap_sp(
+               SCREEN  *sp)
+               { /* void */ }
+
 #undef _nc_screen_wrap
 void   _nc_screen_wrap(void)
                { /* void */ }
 
+#undef _nc_do_xmc_glitch_sp
+void   _nc_do_xmc_glitch_sp(
+               SCREEN  *sp,
+               attr_t  previous)
+               { /* void */ }
+
 #undef _nc_do_xmc_glitch
 void   _nc_do_xmc_glitch(
                attr_t  previous)
@@ -1990,22 +2549,12 @@ 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, 
+               const char *fmt,
                va_list ap)
                { return(*(char **)0); }
 
-/* ./base/memmove.c */
-
-#undef _nc_memmove
-void   _nc_memmove(void)
-               { /* void */ }
-
 /* ./base/vsscanf.c */
 
 #undef _nc_vsscanf
@@ -2014,26 +2563,58 @@ void    _nc_vsscanf(void)
 
 /* ./base/lib_freeall.c */
 
-#include <term_entry.h>
-
 #undef _nc_freeall
 void   _nc_freeall(void)
                { /* void */ }
 
+#undef _nc_free_and_exit_sp
+void   _nc_free_and_exit_sp(
+               SCREEN  *sp,
+               int     code)
+               { /* void */ }
+
+#undef _nc_free_and_exit
+void   _nc_free_and_exit(
+               int     code)
+               { /* void */ }
+
+#undef exit_curses
+void   exit_curses(
+               int     code)
+               { /* void */ }
+
 /* ./expanded.c */
 
 #undef _nc_toggle_attr_on
 void   _nc_toggle_attr_on(
-               attr_t  *S, 
+               attr_t  *S,
                attr_t  at)
                { /* void */ }
 
 #undef _nc_toggle_attr_off
 void   _nc_toggle_attr_off(
-               attr_t  *S, 
+               attr_t  *S,
                attr_t  at)
                { /* void */ }
 
+#undef _nc_DelCharCost_sp
+int    _nc_DelCharCost_sp(
+               SCREEN  *sp,
+               int     count)
+               { return(*(int *)0); }
+
+#undef _nc_InsCharCost_sp
+int    _nc_InsCharCost_sp(
+               SCREEN  *sp,
+               int     count)
+               { return(*(int *)0); }
+
+#undef _nc_UpdateAttrs_sp
+void   _nc_UpdateAttrs_sp(
+               SCREEN  *sp,
+               chtype  c)
+               { /* void */ }
+
 #undef _nc_DelCharCost
 int    _nc_DelCharCost(
                int     count)
@@ -2051,6 +2632,12 @@ void     _nc_UpdateAttrs(
 
 /* ./base/legacy_coding.c */
 
+#undef use_legacy_coding_sp
+int    use_legacy_coding_sp(
+               SCREEN  *sp,
+               int     level)
+               { return(*(int *)0); }
+
 #undef use_legacy_coding
 int    use_legacy_coding(
                int     level)
@@ -2058,41 +2645,87 @@ int     use_legacy_coding(
 
 /* ./base/lib_dft_fgbg.c */
 
+#undef use_default_colors_sp
+int    use_default_colors_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef use_default_colors
 int    use_default_colors(void)
                { return(*(int *)0); }
 
+#undef assume_default_colors_sp
+int    assume_default_colors_sp(
+               SCREEN  *sp,
+               int     fg,
+               int     bg)
+               { return(*(int *)0); }
+
 #undef assume_default_colors
 int    assume_default_colors(
-               int     fg, 
+               int     fg,
                int     bg)
                { return(*(int *)0); }
 
 /* ./tinfo/lib_print.c */
 
+#undef mcprint_sp
+int    mcprint_sp(
+               SCREEN  *sp,
+               char    *data,
+               int     len)
+               { return(*(int *)0); }
+
 #undef mcprint
 int    mcprint(
-               char    *data, 
+               char    *data,
                int     len)
                { return(*(int *)0); }
 
+/* ./base/new_pair.c */
+
+#undef _nc_new_pair
+void   _nc_new_pair(void)
+               { /* void */ }
+
 /* ./base/resizeterm.c */
 
+#undef is_term_resized_sp
+NCURSES_BOOL is_term_resized_sp(
+               SCREEN  *sp,
+               int     ToLines,
+               int     ToCols)
+               { return(*(NCURSES_BOOL *)0); }
+
 #undef is_term_resized
 NCURSES_BOOL is_term_resized(
-               int     ToLines, 
+               int     ToLines,
                int     ToCols)
                { return(*(NCURSES_BOOL *)0); }
 
+#undef resize_term_sp
+int    resize_term_sp(
+               SCREEN  *sp,
+               int     ToLines,
+               int     ToCols)
+               { return(*(int *)0); }
+
 #undef resize_term
 int    resize_term(
-               int     ToLines, 
+               int     ToLines,
+               int     ToCols)
+               { return(*(int *)0); }
+
+#undef resizeterm_sp
+int    resizeterm_sp(
+               SCREEN  *sp,
+               int     ToLines,
                int     ToCols)
                { return(*(int *)0); }
 
 #undef resizeterm
 int    resizeterm(
-               int     ToLines, 
+               int     ToLines,
                int     ToCols)
                { return(*(int *)0); }
 
@@ -2103,20 +2736,35 @@ void    _nc_trace_xnames(
                TERMTYPE *tp)
                { /* void */ }
 
+/* ./tinfo/use_screen.c */
+
+#undef use_screen
+int    use_screen(
+               SCREEN  *screen,
+               NCURSES_SCREEN_CB func,
+               void    *data)
+               { return(*(int *)0); }
+
+/* ./base/use_window.c */
+
+#undef use_window
+int    use_window(
+               WINDOW  *win,
+               NCURSES_WINDOW_CB func,
+               void    *data)
+               { return(*(int *)0); }
+
 /* ./base/wresize.c */
 
 #undef wresize
 int    wresize(
-               WINDOW  *win, 
-               int     ToLines, 
+               WINDOW  *win,
+               int     ToLines,
                int     ToCols)
                { return(*(int *)0); }
 
 /* ./tinfo/access.c */
 
-#include <sys/stat.h>
-#include <nc_alloc.h>
-
 #undef _nc_rootname
 char   *_nc_rootname(
                char    *path)
@@ -2139,7 +2787,7 @@ char      *_nc_basename(
 
 #undef _nc_access
 int    _nc_access(
-               const char *path, 
+               const char *path,
                int     mode)
                { return(*(int *)0); }
 
@@ -2157,12 +2805,25 @@ NCURSES_BOOL _nc_is_file_path(
 int    _nc_env_access(void)
                { return(*(int *)0); }
 
+#undef _nc_safe_fopen
+FILE   *_nc_safe_fopen(
+               const char *path,
+               const char *mode)
+               { return(*(FILE **)0); }
+
+#undef _nc_safe_open3
+int    _nc_safe_open3(
+               const char *path,
+               int     flags,
+               mode_t  mode)
+               { return(*(int *)0); }
+
 /* ./tinfo/add_tries.c */
 
 #undef _nc_add_to_try
 int    _nc_add_to_try(
-               TRIES   **tree, 
-               const char *str, 
+               TRIES   **tree,
+               const char *str,
                unsigned code)
                { return(*(int *)0); }
 
@@ -2170,26 +2831,49 @@ int     _nc_add_to_try(
 
 #undef _nc_align_termtype
 void   _nc_align_termtype(
-               TERMTYPE *to, 
+               TERMTYPE *to,
                TERMTYPE *from)
                { /* void */ }
 
 #undef _nc_copy_termtype
 void   _nc_copy_termtype(
-               TERMTYPE *dst, 
-               TERMTYPE *src)
+               TERMTYPE *dst,
+               const TERMTYPE *src)
                { /* void */ }
 
 /* ./codes.c */
 
 #undef boolcodes
-char   *const boolcodes[] = {0};
+const char *const boolcodes[] = {0};
 #undef numcodes
-char   *const numcodes[] = {0};
+const char *const numcodes[] = {0};
 #undef strcodes
-char   *const strcodes[] = {0};
+const char *const strcodes[] = {0};
+
+/* ./comp_captab.c */
+
+#undef _nc_get_table
+const struct name_table_entry *_nc_get_table(
+               NCURSES_BOOL termcap)
+               { return(*(const struct name_table_entry **)0); }
+
+#undef _nc_get_hash_table
+const HashValue *_nc_get_hash_table(
+               NCURSES_BOOL termcap)
+               { return(*(const HashValue **)0); }
+
+#undef _nc_get_alias_table
+const struct alias *_nc_get_alias_table(
+               NCURSES_BOOL termcap)
+               { return(*(const struct alias **)0); }
+
+#undef _nc_get_hash_info
+const HashData *_nc_get_hash_info(
+               NCURSES_BOOL termcap)
+               { return(*(const HashData **)0); }
 
 /* ./tinfo/comp_error.c */
+
 #undef _nc_suppress_warnings
 NCURSES_BOOL _nc_suppress_warnings;
 #undef _nc_curr_line
@@ -2218,22 +2902,52 @@ void    _nc_get_type(
 
 #undef _nc_warning
 void   _nc_warning(
-               const char *const fmt, 
+               const char *const fmt,
                ...)
                { /* void */ }
 
 #undef _nc_err_abort
 void   _nc_err_abort(
-               const char *const fmt, 
+               const char *const fmt,
                ...)
                { /* void */ }
 
 #undef _nc_syserr_abort
 void   _nc_syserr_abort(
-               const char *const fmt, 
+               const char *const fmt,
                ...)
                { /* void */ }
 
+/* ./tinfo/comp_hash.c */
+
+#undef _nc_find_entry
+struct name_table_entry const *_nc_find_entry(
+               const char *string,
+               const HashValue *hash_table)
+               { return(*(struct name_table_entry const **)0); }
+
+#undef _nc_find_type_entry
+struct name_table_entry const *_nc_find_type_entry(
+               const char *string,
+               int     type,
+               NCURSES_BOOL termcap)
+               { return(*(struct name_table_entry const **)0); }
+
+#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 */
+
+#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
@@ -2252,13 +2966,13 @@ void    _nc_last_db(void)
 
 #undef _nc_next_db
 const char *_nc_next_db(
-               DBDIRS  *state, 
+               DBDIRS  *state,
                int     *offset)
                { return(*(const char **)0); }
 
 #undef _nc_first_db
 void   _nc_first_db(
-               DBDIRS  *state, 
+               DBDIRS  *state,
                int     *offset)
                { /* void */ }
 
@@ -2266,7 +2980,7 @@ void      _nc_first_db(
 
 #undef _nc_doalloc
 void   *_nc_doalloc(
-               void    *oldp, 
+               void    *oldp,
                size_t  amount)
                { return(*(void **)0); }
 
@@ -2279,7 +2993,7 @@ ENTRY     *_nc_tail;
 
 #undef _nc_free_entry
 void   _nc_free_entry(
-               ENTRY   *headp, 
+               ENTRY   *headp,
                TERMTYPE *tterm)
                { /* void */ }
 
@@ -2288,16 +3002,15 @@ 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 */ }
 
+#undef exit_terminfo
+void   exit_terminfo(
+               int     code)
+               { /* void */ }
+
 /* ./fallback.c */
 
 #undef _nc_fallback
@@ -2327,6 +3040,12 @@ int      _nc_getenv_num(
                const char *name)
                { return(*(int *)0); }
 
+#undef _nc_setenv_num
+void   _nc_setenv_num(
+               const char *name,
+               int     value)
+               { /* void */ }
+
 /* ./tinfo/home_terminfo.c */
 
 #undef _nc_home_terminfo
@@ -2335,17 +3054,9 @@ 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(void)
+void   _nc_init_keytry(
+               SCREEN  *sp)
                { /* void */ }
 
 /* ./tinfo/lib_acs.c */
@@ -2353,17 +3064,20 @@ void    _nc_init_keytry(void)
 #undef acs_map
 chtype acs_map[128];
 
+#undef _nc_init_acs_sp
+void   _nc_init_acs_sp(
+               SCREEN  *sp)
+               { /* void */ }
+
 #undef _nc_init_acs
 void   _nc_init_acs(void)
                { /* void */ }
 
 /* ./tinfo/lib_baudrate.c */
 
-#include <termcap.h>
-
 struct speed {
-    int s; 
-    int sp; 
+    int given_speed;
+    int actual_speed;
 };
 
 #undef _nc_baudrate
@@ -2376,6 +3090,11 @@ int      _nc_ospeed(
                int     BaudRate)
                { return(*(int *)0); }
 
+#undef baudrate_sp
+int    baudrate_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef baudrate
 int    baudrate(void)
                { return(*(int *)0); }
@@ -2385,11 +3104,23 @@ int     baudrate(void)
 #undef cur_term
 TERMINAL *cur_term;
 
+#undef set_curterm_sp
+TERMINAL *set_curterm_sp(
+               SCREEN  *sp,
+               TERMINAL *termp)
+               { return(*(TERMINAL **)0); }
+
 #undef set_curterm
 TERMINAL *set_curterm(
                TERMINAL *termp)
                { return(*(TERMINAL **)0); }
 
+#undef del_curterm_sp
+int    del_curterm_sp(
+               SCREEN  *sp,
+               TERMINAL *termp)
+               { return(*(int *)0); }
+
 #undef del_curterm
 int    del_curterm(
                TERMINAL *termp)
@@ -2412,26 +3143,56 @@ NCURSES_GLOBALS _nc_globals;
 #undef _nc_prescreen
 NCURSES_PRESCREEN _nc_prescreen;
 
+#undef _nc_screen_of
+SCREEN *_nc_screen_of(
+               WINDOW  *win)
+               { return(*(SCREEN **)0); }
+
 /* ./tinfo/lib_has_cap.c */
 
+#undef has_ic_sp
+NCURSES_BOOL has_ic_sp(
+               SCREEN  *sp)
+               { return(*(NCURSES_BOOL *)0); }
+
 #undef has_ic
 NCURSES_BOOL has_ic(void)
                { return(*(NCURSES_BOOL *)0); }
 
+#undef has_il_sp
+NCURSES_BOOL has_il_sp(
+               SCREEN  *sp)
+               { return(*(NCURSES_BOOL *)0); }
+
 #undef has_il
 NCURSES_BOOL has_il(void)
                { return(*(NCURSES_BOOL *)0); }
 
 /* ./tinfo/lib_kernel.c */
 
+#undef erasechar_sp
+char   erasechar_sp(
+               SCREEN  *sp)
+               { return(*(char *)0); }
+
 #undef erasechar
 char   erasechar(void)
                { return(*(char *)0); }
 
+#undef killchar_sp
+char   killchar_sp(
+               SCREEN  *sp)
+               { return(*(char *)0); }
+
 #undef killchar
 char   killchar(void)
                { return(*(char *)0); }
 
+#undef flushinp_sp
+int    flushinp_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef flushinp
 int    flushinp(void)
                { return(*(int *)0); }
@@ -2440,20 +3201,35 @@ int     flushinp(void)
 
 struct kn { short offset; int code; };
 
+#undef keyname_sp
+const char *keyname_sp(
+               SCREEN  *sp,
+               int     c)
+               { return(*(const char **)0); }
+
 #undef keyname
-char   *keyname(
+const char *keyname(
                int     c)
-               { return(*(char **)0); }
+               { return(*(const char **)0); }
 
 /* ./tinfo/lib_longname.c */
 
+#undef longname_sp
+char   *longname_sp(
+               SCREEN  *sp)
+               { return(*(char **)0); }
+
 #undef longname
 char   *longname(void)
                { return(*(char **)0); }
 
 /* ./tinfo/lib_napms.c */
 
-#include <time.h>
+#undef napms_sp
+int    napms_sp(
+               SCREEN  *sp,
+               int     ms)
+               { return(*(int *)0); }
 
 #undef napms
 int    napms(
@@ -2464,16 +3240,22 @@ int     napms(
 
 #undef idlok
 int    idlok(
-               WINDOW  *win, 
+               WINDOW  *win,
                NCURSES_BOOL flag)
                { return(*(int *)0); }
 
 #undef idcok
 void   idcok(
-               WINDOW  *win, 
+               WINDOW  *win,
                NCURSES_BOOL flag)
                { /* void */ }
 
+#undef halfdelay_sp
+int    halfdelay_sp(
+               SCREEN  *sp,
+               int     t)
+               { return(*(int *)0); }
+
 #undef halfdelay
 int    halfdelay(
                int     t)
@@ -2481,92 +3263,151 @@ int    halfdelay(
 
 #undef nodelay
 int    nodelay(
-               WINDOW  *win, 
+               WINDOW  *win,
                NCURSES_BOOL flag)
                { return(*(int *)0); }
 
 #undef notimeout
 int    notimeout(
-               WINDOW  *win, 
+               WINDOW  *win,
                NCURSES_BOOL f)
                { return(*(int *)0); }
 
 #undef wtimeout
 void   wtimeout(
-               WINDOW  *win, 
+               WINDOW  *win,
                int     delay)
                { /* void */ }
 
 #undef keypad
 int    keypad(
-               WINDOW  *win, 
+               WINDOW  *win,
                NCURSES_BOOL flag)
                { return(*(int *)0); }
 
 #undef meta
 int    meta(
-               WINDOW  *win, 
+               WINDOW  *win,
                NCURSES_BOOL flag)
                { return(*(int *)0); }
 
+#undef curs_set_sp
+int    curs_set_sp(
+               SCREEN  *sp,
+               int     vis)
+               { return(*(int *)0); }
+
 #undef curs_set
 int    curs_set(
                int     vis)
                { return(*(int *)0); }
 
+#undef typeahead_sp
+int    typeahead_sp(
+               SCREEN  *sp,
+               int     fd)
+               { return(*(int *)0); }
+
 #undef typeahead
 int    typeahead(
                int     fd)
                { return(*(int *)0); }
 
+#undef has_key_sp
+int    has_key_sp(
+               SCREEN  *sp,
+               int     keycode)
+               { return(*(int *)0); }
+
 #undef has_key
 int    has_key(
                int     keycode)
                { return(*(int *)0); }
 
+#undef _nc_putp_flush_sp
+int    _nc_putp_flush_sp(
+               SCREEN  *sp,
+               const char *name,
+               const char *value)
+               { return(*(int *)0); }
+
 #undef _nc_keypad
 int    _nc_keypad(
-               NCURSES_BOOL flag)
+               SCREEN  *sp,
+               int     flag)
                { return(*(int *)0); }
 
 /* ./tinfo/lib_raw.c */
 
+#undef raw_sp
+int    raw_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef raw
 int    raw(void)
                { return(*(int *)0); }
 
+#undef cbreak_sp
+int    cbreak_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef cbreak
 int    cbreak(void)
                { return(*(int *)0); }
 
+#undef qiflush_sp
+void   qiflush_sp(
+               SCREEN  *sp)
+               { /* void */ }
+
 #undef qiflush
 void   qiflush(void)
                { /* void */ }
 
+#undef noraw_sp
+int    noraw_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef noraw
 int    noraw(void)
                { return(*(int *)0); }
 
+#undef nocbreak_sp
+int    nocbreak_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef nocbreak
 int    nocbreak(void)
                { return(*(int *)0); }
 
+#undef noqiflush_sp
+void   noqiflush_sp(
+               SCREEN  *sp)
+               { /* void */ }
+
 #undef noqiflush
 void   noqiflush(void)
                { /* void */ }
 
+#undef intrflush_sp
+int    intrflush_sp(
+               SCREEN  *sp,
+               WINDOW  *win,
+               NCURSES_BOOL flag)
+               { return(*(int *)0); }
+
 #undef intrflush
 int    intrflush(
-               WINDOW  *win, 
+               WINDOW  *win,
                NCURSES_BOOL flag)
                { return(*(int *)0); }
 
 /* ./tinfo/lib_setup.c */
 
-#include <locale.h>
-#include <sys/ioctl.h>
-#include <langinfo.h>
-
 #undef ttytype
 char   ttytype[256];
 #undef LINES
@@ -2576,24 +3417,66 @@ int     COLS;
 #undef TABSIZE
 int    TABSIZE;
 
+#undef set_tabsize_sp
+int    set_tabsize_sp(
+               SCREEN  *sp,
+               int     value)
+               { return(*(int *)0); }
+
+#undef set_tabsize
+int    set_tabsize(
+               int     value)
+               { return(*(int *)0); }
+
 #undef _nc_handle_sigwinch
 int    _nc_handle_sigwinch(
-               int     update)
+               SCREEN  *sp)
                { return(*(int *)0); }
 
+#undef use_env_sp
+void   use_env_sp(
+               SCREEN  *sp,
+               NCURSES_BOOL f)
+               { /* void */ }
+
+#undef use_tioctl_sp
+void   use_tioctl_sp(
+               SCREEN  *sp,
+               NCURSES_BOOL f)
+               { /* void */ }
+
 #undef use_env
 void   use_env(
                NCURSES_BOOL f)
                { /* void */ }
 
+#undef use_tioctl
+void   use_tioctl(
+               NCURSES_BOOL f)
+               { /* void */ }
+
 #undef _nc_get_screensize
 void   _nc_get_screensize(
-               int     *linep, 
+               SCREEN  *sp,
+               int     *linep,
                int     *colp)
                { /* void */ }
 
 #undef _nc_update_screensize
-void   _nc_update_screensize(void)
+void   _nc_update_screensize(
+               SCREEN  *sp)
+               { /* void */ }
+
+#undef _nc_setup_tinfo
+int    _nc_setup_tinfo(
+               const char *const tn,
+               TERMTYPE *const tp)
+               { return(*(int *)0); }
+
+#undef _nc_tinfo_cmdch
+void   _nc_tinfo_cmdch(
+               TERMINAL *termp,
+               int     proto)
                { /* void */ }
 
 #undef _nc_get_locale
@@ -2605,21 +3488,26 @@ int     _nc_unicode_locale(void)
                { return(*(int *)0); }
 
 #undef _nc_locale_breaks_acs
-int    _nc_locale_breaks_acs(void)
+int    _nc_locale_breaks_acs(
+               TERMINAL *termp)
                { return(*(int *)0); }
 
 #undef _nc_setupterm
 int    _nc_setupterm(
-               char    *tname, 
-               int     Filedes, 
-               int     *errret, 
-               NCURSES_BOOL reuse)
+               const char *tname,
+               int     Filedes,
+               int     *errret,
+               int     reuse)
                { return(*(int *)0); }
 
+#undef new_prescr
+SCREEN *new_prescr(void)
+               { return(*(SCREEN **)0); }
+
 #undef setupterm
 int    setupterm(
-               char    *tname, 
-               int     Filedes, 
+               const char *tname,
+               int     Filedes,
                int     *errret)
                { return(*(int *)0); }
 
@@ -2630,36 +3518,61 @@ char    *UP;
 #undef BC
 char   *BC;
 
+#undef tgetent_sp
+int    tgetent_sp(
+               SCREEN  *sp,
+               char    *bufp,
+               const char *name)
+               { return(*(int *)0); }
+
 #undef tgetent
 int    tgetent(
-               char    *bufp, 
+               char    *bufp,
                const char *name)
                { return(*(int *)0); }
 
-#if 0
-
-#include <capdefaults.c>
-
-#endif
+#undef tgetflag_sp
+int    tgetflag_sp(
+               SCREEN  *sp,
+               const char *id)
+               { return(*(int *)0); }
 
 #undef tgetflag
 int    tgetflag(
-               char    *id)
+               const char *id)
+               { return(*(int *)0); }
+
+#undef tgetnum_sp
+int    tgetnum_sp(
+               SCREEN  *sp,
+               const char *id)
                { return(*(int *)0); }
 
 #undef tgetnum
 int    tgetnum(
-               char    *id)
+               const char *id)
                { return(*(int *)0); }
 
+#undef tgetstr_sp
+char   *tgetstr_sp(
+               SCREEN  *sp,
+               const char *id,
+               char    **area)
+               { return(*(char **)0); }
+
 #undef tgetstr
 char   *tgetstr(
-               char    *id, 
+               const char *id,
                char    **area)
                { return(*(char **)0); }
 
 /* ./tinfo/lib_termname.c */
 
+#undef termname_sp
+char   *termname_sp(
+               SCREEN  *sp)
+               { return(*(char **)0); }
+
 #undef termname
 char   *termname(void)
                { return(*(char **)0); }
@@ -2668,26 +3581,44 @@ char    *termname(void)
 
 #undef tgoto
 char   *tgoto(
-               const char *string, 
-               int     x, 
+               const char *string,
+               int     x,
                int     y)
                { return(*(char **)0); }
 
 /* ./tinfo/lib_ti.c */
 
+#undef tigetflag_sp
+int    tigetflag_sp(
+               SCREEN  *sp,
+               const char *str)
+               { return(*(int *)0); }
+
 #undef tigetflag
 int    tigetflag(
-               char    *str)
+               const char *str)
+               { return(*(int *)0); }
+
+#undef tigetnum_sp
+int    tigetnum_sp(
+               SCREEN  *sp,
+               const char *str)
                { return(*(int *)0); }
 
 #undef tigetnum
 int    tigetnum(
-               char    *str)
+               const char *str)
                { return(*(int *)0); }
 
+#undef tigetstr_sp
+char   *tigetstr_sp(
+               SCREEN  *sp,
+               const char *str)
+               { return(*(char **)0); }
+
 #undef tigetstr
 char   *tigetstr(
-               char    *str)
+               const char *str)
                { return(*(char **)0); }
 
 /* ./tinfo/lib_tparm.c */
@@ -2697,49 +3628,134 @@ int    _nc_tparm_err;
 
 #undef _nc_tparm_analyze
 int    _nc_tparm_analyze(
-               const char *string, 
-               char    *p_is_s[9], 
-               int     *popcount)
+               TERMINAL *term,
+               const char *string,
+               char    **p_is_s,
+               int     *_nc_popcount)
                { return(*(int *)0); }
 
 #undef tparm
 char   *tparm(
-               char    *string, 
+               const char *string,
+               ...)
+               { return(*(char **)0); }
+
+#undef tiparm
+char   *tiparm(
+               const char *string,
+               ...)
+               { return(*(char **)0); }
+
+#undef _nc_tiparm
+char   *_nc_tiparm(
+               int     expected,
+               const char *string,
                ...)
                { return(*(char **)0); }
 
+#undef _nc_reset_tparm
+void   _nc_reset_tparm(
+               TERMINAL *term)
+               { /* void */ }
+
 /* ./tinfo/lib_tputs.c */
 
 #undef PC
 char   PC;
 #undef ospeed
-NCURSES_OSPEED ospeed;
+short  ospeed;
 #undef _nc_nulls_sent
 int    _nc_nulls_sent;
 
+#undef _nc_set_no_padding
+void   _nc_set_no_padding(
+               SCREEN  *sp)
+               { /* void */ }
+
+#undef delay_output_sp
+int    delay_output_sp(
+               SCREEN  *sp,
+               int     ms)
+               { return(*(int *)0); }
+
 #undef delay_output
 int    delay_output(
                int     ms)
                { return(*(int *)0); }
 
+#undef _nc_flush_sp
+void   _nc_flush_sp(
+               SCREEN  *sp)
+               { /* void */ }
+
 #undef _nc_flush
 void   _nc_flush(void)
                { /* void */ }
 
+#undef _nc_outch_sp
+int    _nc_outch_sp(
+               SCREEN  *sp,
+               int     ch)
+               { return(*(int *)0); }
+
 #undef _nc_outch
 int    _nc_outch(
                int     ch)
                { return(*(int *)0); }
 
+#undef _nc_putchar_sp
+int    _nc_putchar_sp(
+               SCREEN  *sp,
+               int     ch)
+               { return(*(int *)0); }
+
+#undef _nc_putchar
+int    _nc_putchar(
+               int     ch)
+               { return(*(int *)0); }
+
+#undef putp_sp
+int    putp_sp(
+               SCREEN  *sp,
+               const char *string)
+               { return(*(int *)0); }
+
 #undef putp
 int    putp(
                const char *string)
                { return(*(int *)0); }
 
+#undef _nc_putp_sp
+int    _nc_putp_sp(
+               SCREEN  *sp,
+               const char *name,
+               const char *string)
+               { return(*(int *)0); }
+
+#undef _nc_putp
+int    _nc_putp(
+               const char *name,
+               const char *string)
+               { return(*(int *)0); }
+
+#undef tputs_sp
+int    tputs_sp(
+               SCREEN  *sp,
+               const char *string,
+               int     affcnt,
+               NCURSES_OUTC_sp outc)
+               { return(*(int *)0); }
+
+#undef _nc_outc_wrapper
+int    _nc_outc_wrapper(
+               SCREEN  *sp,
+               int     c)
+               { return(*(int *)0); }
+
 #undef tputs
 int    tputs(
-               const char *string, 
-               int     affcnt, 
+               const char *string,
+               int     affcnt,
                int     (*outc)(
                int     p1))
                { return(*(int *)0); }
@@ -2753,6 +3769,11 @@ const char *_nc_tputs_trace = {0};
 #undef _nc_outchars
 long   _nc_outchars;
 
+#undef curses_trace
+unsigned curses_trace(
+               unsigned tracelevel)
+               { return(*(unsigned *)0); }
+
 #undef trace
 void   trace(
                const unsigned int tracelevel)
@@ -2760,15 +3781,20 @@ void    trace(
 
 #undef _tracef
 void   _tracef(
-               const char *fmt, 
+               const char *fmt,
                ...)
                { /* void */ }
 
 #undef _nc_retrace_bool
 NCURSES_BOOL _nc_retrace_bool(
-               NCURSES_BOOL code)
+               int     code)
                { return(*(NCURSES_BOOL *)0); }
 
+#undef _nc_retrace_char
+char   _nc_retrace_char(
+               int     code)
+               { return(*(char *)0); }
+
 #undef _nc_retrace_int
 int    _nc_retrace_int(
                int     code)
@@ -2790,9 +3816,9 @@ const char *_nc_retrace_cptr(
                { return(*(const char **)0); }
 
 #undef _nc_retrace_cvoid_ptr
-void   *_nc_retrace_cvoid_ptr(
-               void    *code)
-               { return(*(void **)0); }
+const void *_nc_retrace_cvoid_ptr(
+               const void *code)
+               { return(*(const void **)0); }
 
 #undef _nc_retrace_void_ptr
 void   *_nc_retrace_void_ptr(
@@ -2809,11 +3835,18 @@ WINDOW  *_nc_retrace_win(
                WINDOW  *code)
                { return(*(WINDOW **)0); }
 
+#undef _nc_fmt_funcptr
+char   *_nc_fmt_funcptr(
+               char    *target,
+               const char *source,
+               size_t  size)
+               { return(*(char **)0); }
+
 /* ./trace/lib_traceatr.c */
 
 #undef _traceattr2
 char   *_traceattr2(
-               int     bufnum, 
+               int     bufnum,
                chtype  newmode)
                { return(*(char **)0); }
 
@@ -2822,6 +3855,11 @@ char     *_traceattr(
                attr_t  newmode)
                { return(*(char **)0); }
 
+#undef _nc_retrace_int_attr_t
+int    _nc_retrace_int_attr_t(
+               attr_t  code)
+               { return(*(int *)0); }
+
 #undef _nc_retrace_attr_t
 attr_t _nc_retrace_attr_t(
                attr_t  code)
@@ -2829,13 +3867,13 @@ attr_t  _nc_retrace_attr_t(
 
 #undef _nc_altcharset_name
 const char *_nc_altcharset_name(
-               attr_t  attr, 
+               attr_t  attr,
                chtype  ch)
                { return(*(const char **)0); }
 
 #undef _tracechtype2
 char   *_tracechtype2(
-               int     bufnum, 
+               int     bufnum,
                chtype  ch)
                { return(*(char **)0); }
 
@@ -2851,14 +3889,9 @@ chtype   _nc_retrace_chtype(
 
 /* ./trace/lib_tracebits.c */
 
-typedef struct {
-    unsigned int val;
-    const char *name;
-} BITNAMES;
-
 #undef _nc_trace_ttymode
 char   *_nc_trace_ttymode(
-               struct termios *tty)
+               const struct termios *tty)
                { return(*(char **)0); }
 
 #undef _nc_tracebits
@@ -2867,6 +3900,12 @@ char     *_nc_tracebits(void)
 
 /* ./trace/lib_tracechr.c */
 
+#undef _nc_tracechar
+char   *_nc_tracechar(
+               SCREEN  *sp,
+               int     ch)
+               { return(*(char **)0); }
+
 #undef _tracechar
 char   *_tracechar(
                int     ch)
@@ -2874,36 +3913,78 @@ char    *_tracechar(
 
 /* ./tinfo/lib_ttyflags.c */
 
+#undef _nc_get_tty_mode_sp
+int    _nc_get_tty_mode_sp(
+               SCREEN  *sp,
+               struct termios *buf)
+               { return(*(int *)0); }
+
 #undef _nc_get_tty_mode
 int    _nc_get_tty_mode(
                struct termios *buf)
                { return(*(int *)0); }
 
+#undef _nc_set_tty_mode_sp
+int    _nc_set_tty_mode_sp(
+               SCREEN  *sp,
+               struct termios *buf)
+               { return(*(int *)0); }
+
 #undef _nc_set_tty_mode
 int    _nc_set_tty_mode(
                struct termios *buf)
                { return(*(int *)0); }
 
+#undef def_shell_mode_sp
+int    def_shell_mode_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef def_shell_mode
 int    def_shell_mode(void)
                { return(*(int *)0); }
 
+#undef def_prog_mode_sp
+int    def_prog_mode_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef def_prog_mode
 int    def_prog_mode(void)
                { return(*(int *)0); }
 
+#undef reset_prog_mode_sp
+int    reset_prog_mode_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef reset_prog_mode
 int    reset_prog_mode(void)
                { return(*(int *)0); }
 
+#undef reset_shell_mode_sp
+int    reset_shell_mode_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef reset_shell_mode
 int    reset_shell_mode(void)
                { return(*(int *)0); }
 
+#undef savetty_sp
+int    savetty_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef savetty
 int    savetty(void)
                { return(*(int *)0); }
 
+#undef resetty_sp
+int    resetty_sp(
+               SCREEN  *sp)
+               { return(*(int *)0); }
+
 #undef resetty
 int    resetty(void)
                { return(*(int *)0); }
@@ -2912,8 +3993,9 @@ int       resetty(void)
 
 #undef _nc_timed_wait
 int    _nc_timed_wait(
-               int     mode, 
-               int     milliseconds, 
+               SCREEN  *sp,
+               int     mode,
+               int     milliseconds,
                int     *timeleft)
                { return(*(int *)0); }
 
@@ -2926,98 +4008,106 @@ char   *_nc_first_name(
 
 #undef _nc_name_match
 int    _nc_name_match(
-               const char *const namelst, 
-               const char *const name, 
+               const char *const namelst,
+               const char *const name,
                const char *const delim)
                { return(*(int *)0); }
 
 /* ./names.c */
 
 #undef boolnames
-char   *const boolnames[] = {0};
+const char *const boolnames[] = {0};
 #undef boolfnames
-char   *const boolfnames[] = {0};
+const char *const boolfnames[] = {0};
 #undef numnames
-char   *const numnames[] = {0};
+const char *const numnames[] = {0};
 #undef numfnames
-char   *const numfnames[] = {0};
+const char *const numfnames[] = {0};
 #undef strnames
-char   *const strnames[] = {0};
+const char *const strnames[] = {0};
 #undef strfnames
-char   *const strfnames[] = {0};
+const char *const strfnames[] = {0};
+
+/* ./tinfo/obsolete.c */
+
+#undef _nc_set_buffer_sp
+void   _nc_set_buffer_sp(
+               SCREEN  *sp,
+               FILE    *ofp,
+               int     buffered)
+               { /* void */ }
+
+#undef _nc_set_buffer
+void   _nc_set_buffer(
+               FILE    *ofp,
+               int     buffered)
+               { /* void */ }
 
 /* ./tinfo/read_entry.c */
 
-#include <hashed_db.h>
+#undef _nc_init_termtype
+void   _nc_init_termtype(
+               TERMTYPE *const tp)
+               { /* void */ }
 
 #undef _nc_read_termtype
 int    _nc_read_termtype(
-               TERMTYPE *ptr, 
-               char    *buffer, 
+               TERMTYPE *ptr,
+               char    *buffer,
                int     limit)
                { return(*(int *)0); }
 
 #undef _nc_read_file_entry
 int    _nc_read_file_entry(
-               const char *const filename, 
+               const char *const filename,
                TERMTYPE *ptr)
                { return(*(int *)0); }
 
 #undef _nc_read_entry
 int    _nc_read_entry(
-               const char *const name, 
-               char    *const filename, 
+               const char *const name,
+               char    *const filename,
                TERMTYPE *const tp)
                { return(*(int *)0); }
 
 /* ./tinfo/read_termcap.c */
 
-#include <sys/types.h>
-
 #undef _nc_read_termcap_entry
 int    _nc_read_termcap_entry(
-               const char *const tn, 
+               const char *const tn,
                TERMTYPE *const tp)
                { return(*(int *)0); }
 
-/* ./tinfo/setbuf.c */
-
-#undef _nc_set_buffer
-void   _nc_set_buffer(
-               FILE    *ofp, 
-               NCURSES_BOOL buffered)
-               { /* void */ }
-
 /* ./tinfo/strings.c */
 
 #undef _nc_str_init
 string_desc *_nc_str_init(
-               string_desc *dst, 
-               char    *src, 
+               string_desc *dst,
+               char    *src,
                size_t  len)
                { return(*(string_desc **)0); }
 
 #undef _nc_str_null
 string_desc *_nc_str_null(
-               string_desc *dst, 
+               string_desc *dst,
                size_t  len)
                { return(*(string_desc **)0); }
 
 #undef _nc_str_copy
 string_desc *_nc_str_copy(
-               string_desc *dst, 
+               string_desc *dst,
                string_desc *src)
                { return(*(string_desc **)0); }
 
 #undef _nc_safe_strcat
 NCURSES_BOOL _nc_safe_strcat(
-               string_desc *dst, 
+               string_desc *dst,
                const char *src)
                { return(*(NCURSES_BOOL *)0); }
 
 #undef _nc_safe_strcpy
 NCURSES_BOOL _nc_safe_strcpy(
-               string_desc *dst, 
+               string_desc *dst,
                const char *src)
                { return(*(NCURSES_BOOL *)0); }
 
@@ -3025,13 +4115,13 @@ NCURSES_BOOL _nc_safe_strcpy(
 
 #undef _nc_trace_buf
 char   *_nc_trace_buf(
-               int     bufnum, 
+               int     bufnum,
                size_t  want)
                { return(*(char **)0); }
 
 #undef _nc_trace_bufcat
 char   *_nc_trace_bufcat(
-               int     bufnum, 
+               int     bufnum,
                const char *value)
                { return(*(char **)0); }
 
@@ -3046,21 +4136,21 @@ void    _nc_trace_tries(
 
 #undef _nc_expand_try
 char   *_nc_expand_try(
-               TRIES   *tree, 
-               unsigned code, 
-               int     *count, 
+               TRIES   *tree,
+               unsigned code,
+               int     *count,
                size_t  len)
                { return(*(char **)0); }
 
 #undef _nc_remove_key
 int    _nc_remove_key(
-               TRIES   **tree, 
+               TRIES   **tree,
                unsigned code)
                { return(*(int *)0); }
 
 #undef _nc_remove_string
 int    _nc_remove_string(
-               TRIES   **tree, 
+               TRIES   **tree,
                const char *string)
                { return(*(int *)0); }
 
@@ -3073,16 +4163,22 @@ char    *_nc_trim_sgr0(
 
 /* ./unctrl.c */
 
+#undef unctrl_sp
+const char *unctrl_sp(
+               SCREEN  *sp,
+               chtype  ch)
+               { return(*(const char **)0); }
+
 #undef unctrl
-char   *unctrl(
-                chtype ch)
-               { return(*(char **)0); }
+const char *unctrl(
+               chtype  ch)
+               { return(*(const char **)0); }
 
 /* ./trace/visbuf.c */
 
 #undef _nc_visbuf2
 const char *_nc_visbuf2(
-               int     bufnum, 
+               int     bufnum,
                const char *buf)
                { return(*(const char **)0); }
 
@@ -3093,20 +4189,20 @@ const char *_nc_visbuf(
 
 #undef _nc_visbufn
 const char *_nc_visbufn(
-               const char *buf, 
+               const char *buf,
                int     len)
                { return(*(const char **)0); }
 
 #undef _nc_viscbuf2
 const char *_nc_viscbuf2(
-               int     bufnum, 
-               const chtype *buf, 
+               int     bufnum,
+               const chtype *buf,
                int     len)
                { return(*(const char **)0); }
 
 #undef _nc_viscbuf
 const char *_nc_viscbuf(
-               const chtype *buf, 
+               const chtype *buf,
                int     len)
                { return(*(const char **)0); }
 
@@ -3114,7 +4210,7 @@ const char *_nc_viscbuf(
 
 #undef _nc_init_entry
 void   _nc_init_entry(
-               TERMTYPE *const tp)
+               ENTRY   *const tp)
                { /* void */ }
 
 #undef _nc_copy_entry
@@ -3124,121 +4220,81 @@ ENTRY  *_nc_copy_entry(
 
 #undef _nc_save_str
 char   *_nc_save_str(
-               const char *const string)
+               const char *string)
                { return(*(char **)0); }
 
 #undef _nc_wrap_entry
 void   _nc_wrap_entry(
-               ENTRY   *const ep, 
+               ENTRY   *const ep,
                NCURSES_BOOL copy_strings)
                { /* void */ }
 
 #undef _nc_merge_entry
 void   _nc_merge_entry(
-               TERMTYPE *const to, 
-               TERMTYPE *const from)
+               ENTRY   *const target,
+               ENTRY   *const source)
                { /* void */ }
 
 /* ./tinfo/captoinfo.c */
 
 #undef _nc_captoinfo
 char   *_nc_captoinfo(
-               const char *cap, 
-               const char *s, 
+               const char *cap,
+               const char *s,
                int const parameterized)
                { return(*(char **)0); }
 
 #undef _nc_infotocap
 char   *_nc_infotocap(
-               const char *cap, 
-               const char *str, 
+               const char *cap,
+               const char *str,
                int const parameterized)
                { return(*(char **)0); }
 
-/* ./comp_captab.c */
-
-#include <hashsize.h>
-
-#undef _nc_get_table
-const struct name_table_entry *_nc_get_table(
-               NCURSES_BOOL termcap)
-               { return(*(const struct name_table_entry **)0); }
-
-#undef _nc_get_hash_table
-const short *_nc_get_hash_table(
-               NCURSES_BOOL termcap)
-               { return(*(const short **)0); }
-
-#undef _nc_get_alias_table
-const struct alias *_nc_get_alias_table(
-               NCURSES_BOOL termcap)
-               { return(*(const struct alias **)0); }
-
 /* ./tinfo/comp_expand.c */
 
 #undef _nc_tic_expand
 char   *_nc_tic_expand(
-               const char *srcp, 
-               NCURSES_BOOL tic_format, 
+               const char *srcp,
+               NCURSES_BOOL tic_format,
                int     numbers)
                { return(*(char **)0); }
 
-/* ./tinfo/comp_hash.c */
-
-#undef _nc_find_entry
-struct name_table_entry const *_nc_find_entry(
-               const char *string, 
-               const short *hash_table)
-               { return(*(struct name_table_entry const **)0); }
-
-#undef _nc_find_type_entry
-struct name_table_entry const *_nc_find_type_entry(
-               const char *string, 
-               int     type, 
-               const struct name_table_entry *table)
-               { return(*(struct name_table_entry const **)0); }
-
 /* ./tinfo/comp_parse.c */
 
 #undef _nc_check_termtype2
 void   (*_nc_check_termtype2)(
-               TERMTYPE *p1, 
+               TERMTYPE *p1,
                NCURSES_BOOL p2);
-#undef _nc_check_termtype
-void   (*_nc_check_termtype)(
-               TERMTYPE *p1);
 
 #undef _nc_entry_match
 NCURSES_BOOL _nc_entry_match(
-               char    *n1, 
+               char    *n1,
                char    *n2)
                { return(*(NCURSES_BOOL *)0); }
 
 #undef _nc_read_entry_source
 void   _nc_read_entry_source(
-               FILE    *fp, 
-               char    *buf, 
-               int     literal, 
-               NCURSES_BOOL silent, 
+               FILE    *fp,
+               char    *buf,
+               int     literal,
+               NCURSES_BOOL silent,
                NCURSES_BOOL (*hook)(
                ENTRY   *p1))
                { /* void */ }
 
 #undef _nc_resolve_uses2
 int    _nc_resolve_uses2(
-               NCURSES_BOOL fullresolve, 
+               NCURSES_BOOL fullresolve,
                NCURSES_BOOL literal)
                { return(*(int *)0); }
 
-#undef _nc_resolve_uses
-int    _nc_resolve_uses(
-               NCURSES_BOOL fullresolve)
-               { return(*(int *)0); }
-
 /* ./tinfo/comp_scan.c */
 
 #undef _nc_syntax
 int    _nc_syntax;
+#undef _nc_strict_bsd
+int    _nc_strict_bsd;
 #undef _nc_curr_file_pos
 long   _nc_curr_file_pos;
 #undef _nc_comment_start
@@ -3254,7 +4310,7 @@ NCURSES_BOOL _nc_disable_period;
 
 #undef _nc_reset_input
 void   _nc_reset_input(
-               FILE    *fp, 
+               FILE    *fp,
                char    *buf)
                { /* void */ }
 
@@ -3265,7 +4321,7 @@ int       _nc_get_token(
 
 #undef _nc_trans_string
 int    _nc_trans_string(
-               char    *ptr, 
+               char    *ptr,
                char    *last)
                { return(*(int *)0); }
 
@@ -3283,27 +4339,22 @@ void    _nc_panic_mode(
 
 #undef _nc_parse_entry
 int    _nc_parse_entry(
-               struct entry *entryp, 
-               int     literal, 
+               ENTRY   *entryp,
+               int     literal,
                NCURSES_BOOL silent)
                { return(*(int *)0); }
 
 #undef _nc_capcmp
 int    _nc_capcmp(
-               const char *s, 
+               const char *s,
                const char *t)
                { return(*(int *)0); }
 
-typedef struct {
-    const char *from;
-    const char *to;
-} assoc;
-
 /* ./tinfo/write_entry.c */
 
 #undef _nc_set_writedir
 void   _nc_set_writedir(
-               char    *dir)
+               const char *dir)
                { /* void */ }
 
 #undef _nc_write_entry
@@ -3311,15 +4362,30 @@ 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); }
 
 /* ./base/define_key.c */
 
+#undef define_key_sp
+int    define_key_sp(
+               SCREEN  *sp,
+               const char *str,
+               int     keycode)
+               { return(*(int *)0); }
+
 #undef define_key
 int    define_key(
-               const char *str, 
+               const char *str,
                int     keycode)
                { return(*(int *)0); }
 
@@ -3331,6 +4397,12 @@ void     _nc_hashed_db(void)
 
 /* ./base/key_defined.c */
 
+#undef key_defined_sp
+int    key_defined_sp(
+               SCREEN  *sp,
+               const char *str)
+               { return(*(int *)0); }
+
 #undef key_defined
 int    key_defined(
                const char *str)
@@ -3338,17 +4410,31 @@ int     key_defined(
 
 /* ./base/keybound.c */
 
+#undef keybound_sp
+char   *keybound_sp(
+               SCREEN  *sp,
+               int     code,
+               int     count)
+               { return(*(char **)0); }
+
 #undef keybound
 char   *keybound(
-               int     code, 
+               int     code,
                int     count)
                { return(*(char **)0); }
 
 /* ./base/keyok.c */
 
+#undef keyok_sp
+int    keyok_sp(
+               SCREEN  *sp,
+               int     c,
+               NCURSES_BOOL flag)
+               { return(*(int *)0); }
+
 #undef keyok
 int    keyok(
-               int     c, 
+               int     c,
                NCURSES_BOOL flag)
                { return(*(int *)0); }