From cc387b11f421650091d84640e05825ea5161ac66 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 15 Dec 2013 02:33:31 +0000 Subject: [PATCH 1/1] ncurses 5.9 - patch 20131214 + modify configure-script/ifdef's to allow OLD_TTY feature to be suppressed if the type of ospeed is configured using the option --with-ospeed to not be a short. By default, it is a short for termcap-compatibility (adapted from suggestion by Christian Weisgerber). + correct a typo in _nc_baudrate() (patch by Christian Weisgerber, cf: 20061230). + fix a few -Wlogical-op warnings. + updated llib-l* files. --- NEWS | 13 +- configure | 48 +- configure.in | 15 +- dist.mk | 4 +- form/llib-lformtw | 11 +- form/llib-lformw | 11 +- include/nc_string.h | 12 +- include/ncurses_defs | 3 +- ncurses/llib-lncurses | 455 ++++----- ncurses/llib-lncursest | 423 ++++---- ncurses/llib-lncursestw | 565 ++++++----- ncurses/llib-lncursesw | 567 ++++++----- ncurses/llib-ltict | 212 ++++ ncurses/llib-ltinfo | 76 +- ncurses/llib-ltinfot | 1635 ++++++++++++++++++++++++++++++ ncurses/llib-ltinfotw | 76 +- ncurses/llib-ltinfow | 76 +- ncurses/tinfo/db_iterator.c | 12 +- ncurses/tinfo/hashed_db.c | 6 +- ncurses/tinfo/lib_baudrate.c | 69 +- ncurses/tinfo/lib_options.c | 8 +- ncurses/tinfo/read_entry.c | 10 +- ncurses/tinfo/read_termcap.c | 6 +- ncurses/tinfo/write_entry.c | 7 +- package/debian-mingw/changelog | 4 +- package/debian-mingw64/changelog | 4 +- package/debian/changelog | 4 +- package/mingw-ncurses.nsi | 4 +- package/mingw-ncurses.spec | 2 +- package/ncurses.spec | 2 +- progs/dump_entry.c | 42 +- progs/dump_entry.h | 8 +- progs/infocmp.c | 4 +- progs/toe.c | 12 +- progs/tset.c | 7 +- 35 files changed, 3248 insertions(+), 1165 deletions(-) create mode 100644 ncurses/llib-ltict create mode 100644 ncurses/llib-ltinfot diff --git a/NEWS b/NEWS index a75adbb1..58f0dc00 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.2145 2013/12/07 18:26:50 tom Exp $ +-- $Id: NEWS,v 1.2149 2013/12/15 00:43:42 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,17 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20131214 + + modify configure-script/ifdef's to allow OLD_TTY feature to be + suppressed if the type of ospeed is configured using the option + --with-ospeed to not be a short. By default, it is a short for + termcap-compatibility (adapted from suggestion by Christian + Weisgerber). + + correct a typo in _nc_baudrate() (patch by Christian Weisgerber, + cf: 20061230). + + fix a few -Wlogical-op warnings. + + updated llib-l* files. + 20131207 + add form_driver_w() entrypoint to wide-character forms library, as well as test program form_driver_w (adapted from patch by Gaute diff --git a/configure b/configure index 83d27323..1e9dbbd4 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.576 . +# From configure.in Revision: 1.577 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20121002. # @@ -21039,6 +21039,20 @@ echo "${as_me:-configure}:21033: testing moving _XOPEN_SOURCE_EXTENDED to work a ;; esac +# AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. +case "x$NCURSES_OSPEED" in #(vi +*short*) #(vi + cf_compatible=1 + ;; +*) + cf_compatible=0 + ;; +esac + +cat >>confdefs.h <&5 +{ echo "$as_me:21139: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -21298,7 +21312,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:21301: error: ambiguous option: $1 + { { echo "$as_me:21315: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -21317,7 +21331,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:21320: error: unrecognized option: $1 + -*) { { echo "$as_me:21334: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -21428,7 +21442,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; - *) { { echo "$as_me:21431: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:21445: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -21862,7 +21876,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:21865: creating $ac_file" >&5 + { echo "$as_me:21879: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -21880,7 +21894,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:21883: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:21897: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -21893,7 +21907,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:21896: error: cannot find input file: $f" >&5 + { { echo "$as_me:21910: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -21909,7 +21923,7 @@ cat >>$CONFIG_STATUS <<\EOF if test -n "$ac_seen"; then ac_used=`grep '@datarootdir@' $ac_item` if test -z "$ac_used"; then - { echo "$as_me:21912: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:21926: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&2;} @@ -21918,7 +21932,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' $ac_item` if test -n "$ac_seen"; then - { echo "$as_me:21921: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:21935: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&2;} @@ -21955,7 +21969,7 @@ s,@INSTALL@,$ac_INSTALL,;t t ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:21958: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:21972: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&5 echo "$as_me: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&2;} @@ -21966,7 +21980,7 @@ $ac_seen" >&2;} egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out if test -s $tmp/out; then ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` - { echo "$as_me:21969: WARNING: Some variables may not be substituted: + { echo "$as_me:21983: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -22015,7 +22029,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:22018: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:22032: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -22026,7 +22040,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:22029: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:22043: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -22039,7 +22053,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:22042: error: cannot find input file: $f" >&5 + { { echo "$as_me:22056: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -22097,7 +22111,7 @@ cat >>$CONFIG_STATUS <<\EOF rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:22100: $ac_file is unchanged" >&5 + { echo "$as_me:22114: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -22400,7 +22414,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ cygdll|msysdll|mingw) #(vi test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 -echo "${as_me:-configure}:22403: testing overriding CXX_MODEL to SHARED ..." 1>&5 +echo "${as_me:-configure}:22417: testing overriding CXX_MODEL to SHARED ..." 1>&5 with_shared_cxx=yes ;; diff --git a/configure.in b/configure.in index dab67f61..c14ebe79 100644 --- a/configure.in +++ b/configure.in @@ -28,14 +28,14 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: configure.in,v 1.576 2013/11/16 23:22:48 tom Exp $ +dnl $Id: configure.in,v 1.577 2013/12/15 00:03:02 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl dnl See http://invisible-island.net/autoconf/ for additional information. dnl dnl --------------------------------------------------------------------------- AC_PREREQ(2.52.20030208) -AC_REVISION($Revision: 1.576 $) +AC_REVISION($Revision: 1.577 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -1961,6 +1961,17 @@ solaris2*) #(vi ;; esac +# AC_CHECK_SIZEOF demands a literal parameter, no variables. So we do this. +case "x$NCURSES_OSPEED" in #(vi +*short*) #(vi + cf_compatible=1 + ;; +*) + cf_compatible=0 + ;; +esac +AC_DEFINE_UNQUOTED(NCURSES_OSPEED_COMPAT,$cf_compatible,[Define to 1 if termcap variable ospeed is short]) + SUB_SCRIPTS= AC_OUTPUT( \ diff --git a/dist.mk b/dist.mk index eba8a7fe..47455af0 100644 --- a/dist.mk +++ b/dist.mk @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.960 2013/12/07 15:21:58 tom Exp $ +# $Id: dist.mk,v 1.961 2013/12/14 17:30:25 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -37,7 +37,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 5 NCURSES_MINOR = 9 -NCURSES_PATCH = 20131207 +NCURSES_PATCH = 20131214 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/form/llib-lformtw b/form/llib-lformtw index 10639490..6e9cd13f 100644 --- a/form/llib-lformtw +++ b/form/llib-lformtw @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2010 Free Software Foundation, Inc. * + * Copyright (c) 2010,2013 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 +27,7 @@ ****************************************************************************/ /**************************************************************************** - * Author: Thomas E. Dickey 2010 * + * Author: Thomas E. Dickey 2010-on * ****************************************************************************/ /* LINTLIBRARY */ @@ -494,6 +494,13 @@ int form_driver( int c) { return(*(int *)0); } +#undef form_driver_w +int form_driver_w( + FORM *form, + int type, + wchar_t c) + { return(*(int *)0); } + #undef set_field_buffer int set_field_buffer( FIELD *field, diff --git a/form/llib-lformw b/form/llib-lformw index 30c24b56..04cbe2b6 100644 --- a/form/llib-lformw +++ b/form/llib-lformw @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2002-2005,2010 Free Software Foundation, Inc. * + * Copyright (c) 2002-2010,2013 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 +27,7 @@ ****************************************************************************/ /**************************************************************************** - * Author: Thomas E. Dickey 2002-2005,2010 * + * Author: Thomas E. Dickey 2002-on * ****************************************************************************/ /* LINTLIBRARY */ @@ -494,6 +494,13 @@ int form_driver( int c) { return(*(int *)0); } +#undef form_driver_w +int form_driver_w( + FORM *form, + int type, + wchar_t c) + { return(*(int *)0); } + #undef set_field_buffer int set_field_buffer( FIELD *field, diff --git a/include/nc_string.h b/include/nc_string.h index c087a82f..7e6ccd41 100644 --- a/include/nc_string.h +++ b/include/nc_string.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2012 Free Software Foundation, Inc. * + * Copyright (c) 2012,2013 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 * @@ -36,7 +36,7 @@ #include /* - * $Id: nc_string.h,v 1.3 2012/02/23 10:21:17 tom Exp $ + * $Id: nc_string.h,v 1.4 2013/12/15 01:09:19 tom Exp $ * * String-hacks. Use these macros to stifle warnings on (presumably) correct * uses of strcat, strcpy and sprintf. @@ -49,26 +49,26 @@ */ #ifdef __cplusplus -#define NCURSES_VOID /* nothing */ +#define NCURSES_VOID /* nothing */ #else #define NCURSES_VOID (void) #endif #if USE_STRING_HACKS && HAVE_STRLCAT -#define _nc_STRCAT(d,s,n) NCURSES_VOID strlcat((d),(s),(n)) +#define _nc_STRCAT(d,s,n) NCURSES_VOID strlcat((d),(s),NCURSES_CAST(size_t,n)) #else #define _nc_STRCAT(d,s,n) NCURSES_VOID strcat((d),(s)) #endif #if USE_STRING_HACKS && HAVE_STRLCPY -#define _nc_STRCPY(d,s,n) NCURSES_VOID strlcpy((d),(s),(n)) +#define _nc_STRCPY(d,s,n) NCURSES_VOID strlcpy((d),(s),NCURSES_CAST(size_t,n)) #else #define _nc_STRCPY(d,s,n) NCURSES_VOID strcpy((d),(s)) #endif #if USE_STRING_HACKS && HAVE_SNPRINTF #define _nc_SPRINTF NCURSES_VOID snprintf -#define _nc_SLIMIT(n) (n), +#define _nc_SLIMIT(n) NCURSES_CAST(size_t,n), #else #define _nc_SPRINTF NCURSES_VOID sprintf #define _nc_SLIMIT(n) /* nothing */ diff --git a/include/ncurses_defs b/include/ncurses_defs index 7393005f..01ce9ea1 100644 --- a/include/ncurses_defs +++ b/include/ncurses_defs @@ -1,4 +1,4 @@ -# $Id: ncurses_defs,v 1.61 2013/07/06 20:31:28 tom Exp $ +# $Id: ncurses_defs,v 1.62 2013/12/14 23:52:07 tom Exp $ ############################################################################## # Copyright (c) 2000-2012,2013 Free Software Foundation, Inc. # # # @@ -186,6 +186,7 @@ NCURSES_EXPANDED NCURSES_EXT_COLORS NCURSES_EXT_FUNCS NCURSES_NO_PADDING +NCURSES_OSPEED_COMPAT NCURSES_PATHSEP ':' NCURSES_WIDECHAR NEED_PTEM_H diff --git a/ncurses/llib-lncurses b/ncurses/llib-lncurses index 6b479641..d98dcd59 100644 --- a/ncurses/llib-lncurses +++ b/ncurses/llib-lncurses @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2013 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 +27,7 @@ ****************************************************************************/ /**************************************************************************** - * Author: Thomas E. Dickey 1996-2010,2011 * + * Author: Thomas E. Dickey 1996-on * ****************************************************************************/ /* LINTLIBRARY */ @@ -95,8 +95,6 @@ void _nc_scroll_oldhash( /* ./base/lib_addch.c */ -#include - #undef _nc_render chtype _nc_render( WINDOW *win, @@ -219,8 +217,6 @@ int wclrtoeol( /* ./base/lib_color.c */ -#include - #undef COLOR_PAIRS int COLOR_PAIRS; #undef COLORS @@ -329,17 +325,17 @@ int pair_content( #undef _nc_do_color_sp void _nc_do_color_sp( SCREEN *sp, - short old_pair, - short pair, - NCURSES_BOOL reverse, + 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 old_pair, + int pair, + int reverse, NCURSES_OUTC outc) { /* void */ } @@ -418,85 +414,85 @@ int flash(void) /* ./lib_gen.c */ #undef addch -int addch( +int (addch)( const chtype z) { return(*(int *)0); } #undef addchnstr -int addchnstr( +int (addchnstr)( const chtype *a1, int z) { return(*(int *)0); } #undef addchstr -int addchstr( +int (addchstr)( const chtype *z) { return(*(int *)0); } #undef addnstr -int addnstr( +int (addnstr)( const char *a1, int z) { return(*(int *)0); } #undef addstr -int addstr( +int (addstr)( const char *z) { return(*(int *)0); } #undef attroff -int attroff( +int (attroff)( NCURSES_ATTR_T z) { return(*(int *)0); } #undef attron -int attron( +int (attron)( NCURSES_ATTR_T z) { return(*(int *)0); } #undef attrset -int attrset( +int (attrset)( NCURSES_ATTR_T z) { return(*(int *)0); } #undef attr_get -int attr_get( +int (attr_get)( attr_t *a1, short *a2, void *z) { return(*(int *)0); } #undef attr_off -int attr_off( +int (attr_off)( attr_t a1, void *z) { return(*(int *)0); } #undef attr_on -int attr_on( +int (attr_on)( attr_t a1, void *z) { return(*(int *)0); } #undef attr_set -int attr_set( +int (attr_set)( attr_t a1, short a2, void *z) { return(*(int *)0); } #undef bkgd -int bkgd( +int (bkgd)( chtype z) { return(*(int *)0); } #undef bkgdset -void bkgdset( +void (bkgdset)( chtype z) { /* void */ } #undef border -int border( +int (border)( chtype a1, chtype a2, chtype a3, @@ -508,14 +504,14 @@ int border( { return(*(int *)0); } #undef box -int box( +int (box)( WINDOW *a1, chtype a2, chtype z) { return(*(int *)0); } #undef chgat -int chgat( +int (chgat)( int a1, attr_t a2, short a3, @@ -523,137 +519,137 @@ int chgat( { return(*(int *)0); } #undef clear -int clear(void) +int (clear)(void) { return(*(int *)0); } #undef clrtobot -int clrtobot(void) +int (clrtobot)(void) { return(*(int *)0); } #undef clrtoeol -int clrtoeol(void) +int (clrtoeol)(void) { return(*(int *)0); } #undef color_set -int color_set( +int (color_set)( short a1, void *z) { return(*(int *)0); } #undef COLOR_PAIR -int COLOR_PAIR( +int (COLOR_PAIR)( int z) { return(*(int *)0); } #undef delch -int delch(void) +int (delch)(void) { return(*(int *)0); } #undef deleteln -int deleteln(void) +int (deleteln)(void) { return(*(int *)0); } #undef echochar -int echochar( +int (echochar)( const chtype z) { return(*(int *)0); } #undef erase -int erase(void) +int (erase)(void) { return(*(int *)0); } #undef getbkgd -chtype getbkgd( +chtype (getbkgd)( WINDOW *z) { return(*(chtype *)0); } #undef getch -int getch(void) +int (getch)(void) { return(*(int *)0); } #undef getnstr -int getnstr( +int (getnstr)( char *a1, int z) { return(*(int *)0); } #undef getstr -int getstr( +int (getstr)( char *z) { return(*(int *)0); } #undef hline -int hline( +int (hline)( chtype a1, int z) { return(*(int *)0); } #undef inch -chtype inch(void) +chtype (inch)(void) { return(*(chtype *)0); } #undef inchnstr -int inchnstr( +int (inchnstr)( chtype *a1, int z) { return(*(int *)0); } #undef inchstr -int inchstr( +int (inchstr)( chtype *z) { return(*(int *)0); } #undef innstr -int innstr( +int (innstr)( char *a1, int z) { return(*(int *)0); } #undef insch -int insch( +int (insch)( chtype z) { return(*(int *)0); } #undef insdelln -int insdelln( +int (insdelln)( int z) { return(*(int *)0); } #undef insertln -int insertln(void) +int (insertln)(void) { return(*(int *)0); } #undef insnstr -int insnstr( +int (insnstr)( const char *a1, int z) { return(*(int *)0); } #undef insstr -int insstr( +int (insstr)( const char *z) { return(*(int *)0); } #undef instr -int instr( +int (instr)( char *z) { return(*(int *)0); } #undef move -int move( +int (move)( int a1, int z) { return(*(int *)0); } #undef mvaddch -int mvaddch( +int (mvaddch)( int a1, int a2, const chtype z) { return(*(int *)0); } #undef mvaddchnstr -int mvaddchnstr( +int (mvaddchnstr)( int a1, int a2, const chtype *a3, @@ -661,14 +657,14 @@ int mvaddchnstr( { return(*(int *)0); } #undef mvaddchstr -int mvaddchstr( +int (mvaddchstr)( int a1, int a2, const chtype *z) { return(*(int *)0); } #undef mvaddnstr -int mvaddnstr( +int (mvaddnstr)( int a1, int a2, const char *a3, @@ -676,14 +672,14 @@ int mvaddnstr( { return(*(int *)0); } #undef mvaddstr -int mvaddstr( +int (mvaddstr)( int a1, int a2, const char *z) { return(*(int *)0); } #undef mvchgat -int mvchgat( +int (mvchgat)( int a1, int a2, int a3, @@ -693,19 +689,19 @@ int mvchgat( { return(*(int *)0); } #undef mvdelch -int mvdelch( +int (mvdelch)( int a1, int z) { return(*(int *)0); } #undef mvgetch -int mvgetch( +int (mvgetch)( int a1, int z) { return(*(int *)0); } #undef mvgetnstr -int mvgetnstr( +int (mvgetnstr)( int a1, int a2, char *a3, @@ -713,14 +709,14 @@ int mvgetnstr( { return(*(int *)0); } #undef mvgetstr -int mvgetstr( +int (mvgetstr)( int a1, int a2, char *z) { return(*(int *)0); } #undef mvhline -int mvhline( +int (mvhline)( int a1, int a2, chtype a3, @@ -728,13 +724,13 @@ int mvhline( { return(*(int *)0); } #undef mvinch -chtype mvinch( +chtype (mvinch)( int a1, int z) { return(*(chtype *)0); } #undef mvinchnstr -int mvinchnstr( +int (mvinchnstr)( int a1, int a2, chtype *a3, @@ -742,14 +738,14 @@ int mvinchnstr( { return(*(int *)0); } #undef mvinchstr -int mvinchstr( +int (mvinchstr)( int a1, int a2, chtype *z) { return(*(int *)0); } #undef mvinnstr -int mvinnstr( +int (mvinnstr)( int a1, int a2, char *a3, @@ -757,14 +753,14 @@ int mvinnstr( { return(*(int *)0); } #undef mvinsch -int mvinsch( +int (mvinsch)( int a1, int a2, chtype z) { return(*(int *)0); } #undef mvinsnstr -int mvinsnstr( +int (mvinsnstr)( int a1, int a2, const char *a3, @@ -772,21 +768,21 @@ int mvinsnstr( { return(*(int *)0); } #undef mvinsstr -int mvinsstr( +int (mvinsstr)( int a1, int a2, const char *z) { return(*(int *)0); } #undef mvinstr -int mvinstr( +int (mvinstr)( int a1, int a2, char *z) { return(*(int *)0); } #undef mvvline -int mvvline( +int (mvvline)( int a1, int a2, chtype a3, @@ -794,7 +790,7 @@ int mvvline( { return(*(int *)0); } #undef mvwaddch -int mvwaddch( +int (mvwaddch)( WINDOW *a1, int a2, int a3, @@ -802,7 +798,7 @@ int mvwaddch( { return(*(int *)0); } #undef mvwaddchnstr -int mvwaddchnstr( +int (mvwaddchnstr)( WINDOW *a1, int a2, int a3, @@ -811,7 +807,7 @@ int mvwaddchnstr( { return(*(int *)0); } #undef mvwaddchstr -int mvwaddchstr( +int (mvwaddchstr)( WINDOW *a1, int a2, int a3, @@ -819,7 +815,7 @@ int mvwaddchstr( { return(*(int *)0); } #undef mvwaddnstr -int mvwaddnstr( +int (mvwaddnstr)( WINDOW *a1, int a2, int a3, @@ -828,7 +824,7 @@ int mvwaddnstr( { return(*(int *)0); } #undef mvwaddstr -int mvwaddstr( +int (mvwaddstr)( WINDOW *a1, int a2, int a3, @@ -836,7 +832,7 @@ int mvwaddstr( { return(*(int *)0); } #undef mvwchgat -int mvwchgat( +int (mvwchgat)( WINDOW *a1, int a2, int a3, @@ -847,21 +843,21 @@ int mvwchgat( { return(*(int *)0); } #undef mvwdelch -int mvwdelch( +int (mvwdelch)( WINDOW *a1, int a2, int z) { return(*(int *)0); } #undef mvwgetch -int mvwgetch( +int (mvwgetch)( WINDOW *a1, int a2, int z) { return(*(int *)0); } #undef mvwgetnstr -int mvwgetnstr( +int (mvwgetnstr)( WINDOW *a1, int a2, int a3, @@ -870,7 +866,7 @@ int mvwgetnstr( { return(*(int *)0); } #undef mvwgetstr -int mvwgetstr( +int (mvwgetstr)( WINDOW *a1, int a2, int a3, @@ -878,7 +874,7 @@ int mvwgetstr( { return(*(int *)0); } #undef mvwhline -int mvwhline( +int (mvwhline)( WINDOW *a1, int a2, int a3, @@ -887,14 +883,14 @@ int mvwhline( { return(*(int *)0); } #undef mvwinch -chtype mvwinch( +chtype (mvwinch)( WINDOW *a1, int a2, int z) { return(*(chtype *)0); } #undef mvwinchnstr -int mvwinchnstr( +int (mvwinchnstr)( WINDOW *a1, int a2, int a3, @@ -903,7 +899,7 @@ int mvwinchnstr( { return(*(int *)0); } #undef mvwinchstr -int mvwinchstr( +int (mvwinchstr)( WINDOW *a1, int a2, int a3, @@ -911,7 +907,7 @@ int mvwinchstr( { return(*(int *)0); } #undef mvwinnstr -int mvwinnstr( +int (mvwinnstr)( WINDOW *a1, int a2, int a3, @@ -920,7 +916,7 @@ int mvwinnstr( { return(*(int *)0); } #undef mvwinsch -int mvwinsch( +int (mvwinsch)( WINDOW *a1, int a2, int a3, @@ -928,7 +924,7 @@ int mvwinsch( { return(*(int *)0); } #undef mvwinsnstr -int mvwinsnstr( +int (mvwinsnstr)( WINDOW *a1, int a2, int a3, @@ -937,7 +933,7 @@ int mvwinsnstr( { return(*(int *)0); } #undef mvwinsstr -int mvwinsstr( +int (mvwinsstr)( WINDOW *a1, int a2, int a3, @@ -945,7 +941,7 @@ int mvwinsstr( { return(*(int *)0); } #undef mvwinstr -int mvwinstr( +int (mvwinstr)( WINDOW *a1, int a2, int a3, @@ -953,7 +949,7 @@ int mvwinstr( { return(*(int *)0); } #undef mvwvline -int mvwvline( +int (mvwvline)( WINDOW *a1, int a2, int a3, @@ -962,117 +958,117 @@ int mvwvline( { return(*(int *)0); } #undef PAIR_NUMBER -int PAIR_NUMBER( +int (PAIR_NUMBER)( int z) { return(*(int *)0); } #undef redrawwin -int redrawwin( +int (redrawwin)( WINDOW *z) { return(*(int *)0); } #undef refresh -int refresh(void) +int (refresh)(void) { return(*(int *)0); } #undef scrl -int scrl( +int (scrl)( int z) { return(*(int *)0); } #undef scroll -int scroll( +int (scroll)( WINDOW *z) { return(*(int *)0); } #undef setscrreg -int setscrreg( +int (setscrreg)( int a1, int z) { return(*(int *)0); } #undef standout -int standout(void) +int (standout)(void) { return(*(int *)0); } #undef standend -int standend(void) +int (standend)(void) { return(*(int *)0); } #undef timeout -void timeout( +void (timeout)( int z) { /* void */ } #undef touchline -int touchline( +int (touchline)( WINDOW *a1, int a2, int z) { return(*(int *)0); } #undef touchwin -int touchwin( +int (touchwin)( WINDOW *z) { return(*(int *)0); } #undef untouchwin -int untouchwin( +int (untouchwin)( WINDOW *z) { return(*(int *)0); } #undef vline -int vline( +int (vline)( chtype a1, int z) { return(*(int *)0); } #undef vw_printw -int vw_printw( +int (vw_printw)( WINDOW *a1, const char *a2, va_list z) { return(*(int *)0); } #undef vw_scanw -int vw_scanw( +int (vw_scanw)( WINDOW *a1, char *a2, va_list z) { return(*(int *)0); } #undef waddchstr -int waddchstr( +int (waddchstr)( WINDOW *a1, const chtype *z) { return(*(int *)0); } #undef waddstr -int waddstr( +int (waddstr)( WINDOW *a1, const char *z) { return(*(int *)0); } #undef wattron -int wattron( +int (wattron)( WINDOW *a1, int z) { return(*(int *)0); } #undef wattroff -int wattroff( +int (wattroff)( WINDOW *a1, int z) { return(*(int *)0); } #undef wattrset -int wattrset( +int (wattrset)( WINDOW *a1, int z) { return(*(int *)0); } #undef wattr_get -int wattr_get( +int (wattr_get)( WINDOW *a1, attr_t *a2, short *a3, @@ -1080,7 +1076,7 @@ int wattr_get( { return(*(int *)0); } #undef wattr_set -int wattr_set( +int (wattr_set)( WINDOW *a1, attr_t a2, short a3, @@ -1088,168 +1084,168 @@ int wattr_set( { return(*(int *)0); } #undef wdeleteln -int wdeleteln( +int (wdeleteln)( WINDOW *z) { return(*(int *)0); } #undef wgetstr -int wgetstr( +int (wgetstr)( WINDOW *a1, char *z) { return(*(int *)0); } #undef winchstr -int winchstr( +int (winchstr)( WINDOW *a1, chtype *z) { return(*(int *)0); } #undef winsertln -int winsertln( +int (winsertln)( WINDOW *z) { return(*(int *)0); } #undef winsstr -int winsstr( +int (winsstr)( WINDOW *a1, const char *z) { return(*(int *)0); } #undef winstr -int winstr( +int (winstr)( WINDOW *a1, char *z) { return(*(int *)0); } #undef wstandout -int wstandout( +int (wstandout)( WINDOW *z) { return(*(int *)0); } #undef wstandend -int wstandend( +int (wstandend)( WINDOW *z) { return(*(int *)0); } #undef getattrs -int getattrs( +int (getattrs)( const WINDOW *z) { return(*(int *)0); } #undef getcurx -int getcurx( +int (getcurx)( const WINDOW *z) { return(*(int *)0); } #undef getcury -int getcury( +int (getcury)( const WINDOW *z) { return(*(int *)0); } #undef getbegx -int getbegx( +int (getbegx)( const WINDOW *z) { return(*(int *)0); } #undef getbegy -int getbegy( +int (getbegy)( const WINDOW *z) { return(*(int *)0); } #undef getmaxx -int getmaxx( +int (getmaxx)( const WINDOW *z) { return(*(int *)0); } #undef getmaxy -int getmaxy( +int (getmaxy)( const WINDOW *z) { return(*(int *)0); } #undef getparx -int getparx( +int (getparx)( const WINDOW *z) { return(*(int *)0); } #undef getpary -int getpary( +int (getpary)( const WINDOW *z) { return(*(int *)0); } #undef wgetparent -WINDOW *wgetparent( +WINDOW *(wgetparent)( const WINDOW *z) { return(*(WINDOW **)0); } #undef is_cleared -NCURSES_BOOL is_cleared( +NCURSES_BOOL (is_cleared)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_idcok -NCURSES_BOOL is_idcok( +NCURSES_BOOL (is_idcok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_idlok -NCURSES_BOOL is_idlok( +NCURSES_BOOL (is_idlok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_immedok -NCURSES_BOOL is_immedok( +NCURSES_BOOL (is_immedok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_keypad -NCURSES_BOOL is_keypad( +NCURSES_BOOL (is_keypad)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_leaveok -NCURSES_BOOL is_leaveok( +NCURSES_BOOL (is_leaveok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_nodelay -NCURSES_BOOL is_nodelay( +NCURSES_BOOL (is_nodelay)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_notimeout -NCURSES_BOOL is_notimeout( +NCURSES_BOOL (is_notimeout)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_pad -NCURSES_BOOL is_pad( +NCURSES_BOOL (is_pad)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_scrollok -NCURSES_BOOL is_scrollok( +NCURSES_BOOL (is_scrollok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_subwin -NCURSES_BOOL is_subwin( +NCURSES_BOOL (is_subwin)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_syncok -NCURSES_BOOL is_syncok( +NCURSES_BOOL (is_syncok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef wgetscrreg -int wgetscrreg( +int (wgetscrreg)( const WINDOW *a1, int *a2, int *z) { return(*(int *)0); } #undef mouse_trafo -NCURSES_BOOL mouse_trafo( +NCURSES_BOOL (mouse_trafo)( int *a1, int *a2, NCURSES_BOOL z) @@ -1257,8 +1253,6 @@ NCURSES_BOOL mouse_trafo( /* ./base/lib_getch.c */ -#include - #undef ESCDELAY int ESCDELAY; @@ -1523,6 +1517,23 @@ void _nc_mvcur_wrap_sp( 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, @@ -1932,8 +1943,8 @@ int scr_set( void _nc_scroll_window( WINDOW *win, int const n, - short const top, - short const bottom, + int const top, + int const bottom, chtype blank) { /* void */ } @@ -1978,7 +1989,7 @@ int _nc_setupscreen_sp( int slines, int scolumns, FILE *output, - NCURSES_BOOL filtered, + int filtered, int slk_format) { return(*(int *)0); } @@ -1987,7 +1998,7 @@ int _nc_setupscreen( int slines, int scolumns, FILE *output, - NCURSES_BOOL filtered, + int filtered, int slk_format) { return(*(int *)0); } @@ -2263,11 +2274,9 @@ char *_tracemouse( /* ./tty/lib_tstp.c */ -#include - #undef _nc_signal_handler void _nc_signal_handler( - NCURSES_BOOL enable) + int enable) { /* void */ } /* ./base/lib_ungetch.c */ @@ -2425,9 +2434,6 @@ char *_nc_printf_string( /* ./tty/tty_update.c */ -#include -#include - #undef doupdate_sp int doupdate_sp( SCREEN *sp) @@ -2504,12 +2510,6 @@ char *_nc_varargs( va_list ap) { return(*(char **)0); } -/* ./base/memmove.c */ - -#undef _nc_memmove -void _nc_memmove(void) - { /* void */ } - /* ./base/vsscanf.c */ #undef _nc_vsscanf @@ -2769,7 +2769,7 @@ void _nc_align_termtype( #undef _nc_copy_termtype void _nc_copy_termtype( TERMTYPE *dst, - TERMTYPE *src) + const TERMTYPE *src) { /* void */ } /* ./codes.c */ @@ -2783,8 +2783,6 @@ char *const strcodes[] = {0}; /* ./comp_captab.c */ -#include - #undef _nc_get_table const struct name_table_entry *_nc_get_table( NCURSES_BOOL termcap) @@ -2959,6 +2957,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 @@ -2967,15 +2971,6 @@ char *_nc_home_terminfo(void) /* ./tinfo/init_keytry.c */ -#if 0 - -#include - -#undef _nc_tinfo_fkeys -const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0}; - -#endif - #undef _nc_init_keytry void _nc_init_keytry( SCREEN *sp) @@ -2997,8 +2992,6 @@ void _nc_init_acs(void) /* ./tinfo/lib_baudrate.c */ -#include - struct speed { int s; int sp; @@ -3144,8 +3137,6 @@ char *longname(void) /* ./tinfo/lib_napms.c */ -#include - #undef napms_sp int napms_sp( SCREEN *sp, @@ -3255,7 +3246,7 @@ int _nc_putp_flush_sp( #undef _nc_keypad int _nc_keypad( SCREEN *sp, - NCURSES_BOOL flag) + int flag) { return(*(int *)0); } /* ./tinfo/lib_raw.c */ @@ -3329,10 +3320,6 @@ int intrflush( /* ./tinfo/lib_setup.c */ -#include -#include -#include - #undef ttytype char ttytype[256]; #undef LINES @@ -3364,17 +3351,17 @@ void use_env_sp( NCURSES_BOOL f) { /* void */ } -#undef use_env -void use_env( - 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) @@ -3401,7 +3388,7 @@ int _nc_setup_tinfo( #undef _nc_tinfo_cmdch void _nc_tinfo_cmdch( TERMINAL *termp, - char proto) + int proto) { /* void */ } #undef _nc_get_locale @@ -3422,7 +3409,7 @@ int _nc_setupterm( char *tname, int Filedes, int *errret, - NCURSES_BOOL reuse) + int reuse) { return(*(int *)0); } #undef new_prescr @@ -3450,12 +3437,6 @@ int tgetent_sp( const char *name) { return(*(int *)0); } -#if 0 - -#include - -#endif - #undef tgetent int tgetent( char *bufp, @@ -3561,7 +3542,7 @@ int _nc_tparm_err; int _nc_tparm_analyze( const char *string, char *p_is_s[9], - int *popcount) + int *_nc_popcount) { return(*(int *)0); } #undef tparm @@ -3581,7 +3562,7 @@ char *tiparm( #undef PC char PC; #undef ospeed -NCURSES_OSPEED ospeed; +short ospeed; #undef _nc_nulls_sent int _nc_nulls_sent; @@ -3621,12 +3602,28 @@ 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, @@ -3634,11 +3631,6 @@ int _nc_putp_sp( const char *string) { return(*(int *)0); } -#undef putp -int putp( - const char *string) - { return(*(int *)0); } - #undef _nc_putp int _nc_putp( const char *name, @@ -3689,12 +3681,12 @@ void _tracef( #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( - char code) + int code) { return(*(char *)0); } #undef _nc_retrace_int @@ -3928,9 +3920,27 @@ char *const strnames[] = {0}; #undef strfnames 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 +#undef _nc_init_termtype +void _nc_init_termtype( + TERMTYPE *const tp) + { /* void */ } #undef _nc_read_termtype int _nc_read_termtype( @@ -3954,27 +3964,8 @@ int _nc_read_entry( /* ./tinfo/read_termcap.c */ -#include - -#undef _nc_read_termcap_entry -int _nc_read_termcap_entry( - const char *const tn, - TERMTYPE *const tp) - { return(*(int *)0); } - -/* ./tinfo/setbuf.c */ - -#undef _nc_set_buffer_sp -void _nc_set_buffer_sp( - SCREEN *sp, - FILE *ofp, - NCURSES_BOOL buffered) - { /* void */ } - -#undef _nc_set_buffer -void _nc_set_buffer( - FILE *ofp, - NCURSES_BOOL buffered) +#undef _nc_read_termcap +void _nc_read_termcap(void) { /* void */ } /* ./tinfo/strings.c */ @@ -4200,6 +4191,8 @@ int _nc_resolve_uses( #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 diff --git a/ncurses/llib-lncursest b/ncurses/llib-lncursest index ad216642..3401ad36 100644 --- a/ncurses/llib-lncursest +++ b/ncurses/llib-lncursest @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2008-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 2008-2011,2013 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 * @@ -332,17 +332,17 @@ int pair_content( #undef _nc_do_color_sp void _nc_do_color_sp( SCREEN *sp, - short old_pair, - short pair, - NCURSES_BOOL reverse, + 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 old_pair, + int pair, + int reverse, NCURSES_OUTC outc) { /* void */ } @@ -420,86 +420,88 @@ int flash(void) /* ./lib_gen.c */ +#include + #undef addch -int addch( +int (addch)( const chtype z) { return(*(int *)0); } #undef addchnstr -int addchnstr( +int (addchnstr)( const chtype *a1, int z) { return(*(int *)0); } #undef addchstr -int addchstr( +int (addchstr)( const chtype *z) { return(*(int *)0); } #undef addnstr -int addnstr( +int (addnstr)( const char *a1, int z) { return(*(int *)0); } #undef addstr -int addstr( +int (addstr)( const char *z) { return(*(int *)0); } #undef attroff -int attroff( - NCURSES_ATTR_T z) +int (attroff)( + int z) { return(*(int *)0); } #undef attron -int attron( - NCURSES_ATTR_T z) +int (attron)( + int z) { return(*(int *)0); } #undef attrset -int attrset( - NCURSES_ATTR_T z) +int (attrset)( + int z) { return(*(int *)0); } #undef attr_get -int attr_get( +int (attr_get)( attr_t *a1, short *a2, void *z) { return(*(int *)0); } #undef attr_off -int attr_off( +int (attr_off)( attr_t a1, void *z) { return(*(int *)0); } #undef attr_on -int attr_on( +int (attr_on)( attr_t a1, void *z) { return(*(int *)0); } #undef attr_set -int attr_set( +int (attr_set)( attr_t a1, short a2, void *z) { return(*(int *)0); } #undef bkgd -int bkgd( +int (bkgd)( chtype z) { return(*(int *)0); } #undef bkgdset -void bkgdset( +void (bkgdset)( chtype z) { /* void */ } #undef border -int border( +int (border)( chtype a1, chtype a2, chtype a3, @@ -511,14 +513,14 @@ int border( { return(*(int *)0); } #undef box -int box( +int (box)( WINDOW *a1, chtype a2, chtype z) { return(*(int *)0); } #undef chgat -int chgat( +int (chgat)( int a1, attr_t a2, short a3, @@ -526,137 +528,137 @@ int chgat( { return(*(int *)0); } #undef clear -int clear(void) +int (clear)(void) { return(*(int *)0); } #undef clrtobot -int clrtobot(void) +int (clrtobot)(void) { return(*(int *)0); } #undef clrtoeol -int clrtoeol(void) +int (clrtoeol)(void) { return(*(int *)0); } #undef color_set -int color_set( +int (color_set)( short a1, void *z) { return(*(int *)0); } #undef COLOR_PAIR -int COLOR_PAIR( +int (COLOR_PAIR)( int z) { return(*(int *)0); } #undef delch -int delch(void) +int (delch)(void) { return(*(int *)0); } #undef deleteln -int deleteln(void) +int (deleteln)(void) { return(*(int *)0); } #undef echochar -int echochar( +int (echochar)( const chtype z) { return(*(int *)0); } #undef erase -int erase(void) +int (erase)(void) { return(*(int *)0); } #undef getbkgd -chtype getbkgd( +chtype (getbkgd)( WINDOW *z) { return(*(chtype *)0); } #undef getch -int getch(void) +int (getch)(void) { return(*(int *)0); } #undef getnstr -int getnstr( +int (getnstr)( char *a1, int z) { return(*(int *)0); } #undef getstr -int getstr( +int (getstr)( char *z) { return(*(int *)0); } #undef hline -int hline( +int (hline)( chtype a1, int z) { return(*(int *)0); } #undef inch -chtype inch(void) +chtype (inch)(void) { return(*(chtype *)0); } #undef inchnstr -int inchnstr( +int (inchnstr)( chtype *a1, int z) { return(*(int *)0); } #undef inchstr -int inchstr( +int (inchstr)( chtype *z) { return(*(int *)0); } #undef innstr -int innstr( +int (innstr)( char *a1, int z) { return(*(int *)0); } #undef insch -int insch( +int (insch)( chtype z) { return(*(int *)0); } #undef insdelln -int insdelln( +int (insdelln)( int z) { return(*(int *)0); } #undef insertln -int insertln(void) +int (insertln)(void) { return(*(int *)0); } #undef insnstr -int insnstr( +int (insnstr)( const char *a1, int z) { return(*(int *)0); } #undef insstr -int insstr( +int (insstr)( const char *z) { return(*(int *)0); } #undef instr -int instr( +int (instr)( char *z) { return(*(int *)0); } #undef move -int move( +int (move)( int a1, int z) { return(*(int *)0); } #undef mvaddch -int mvaddch( +int (mvaddch)( int a1, int a2, const chtype z) { return(*(int *)0); } #undef mvaddchnstr -int mvaddchnstr( +int (mvaddchnstr)( int a1, int a2, const chtype *a3, @@ -664,14 +666,14 @@ int mvaddchnstr( { return(*(int *)0); } #undef mvaddchstr -int mvaddchstr( +int (mvaddchstr)( int a1, int a2, const chtype *z) { return(*(int *)0); } #undef mvaddnstr -int mvaddnstr( +int (mvaddnstr)( int a1, int a2, const char *a3, @@ -679,14 +681,14 @@ int mvaddnstr( { return(*(int *)0); } #undef mvaddstr -int mvaddstr( +int (mvaddstr)( int a1, int a2, const char *z) { return(*(int *)0); } #undef mvchgat -int mvchgat( +int (mvchgat)( int a1, int a2, int a3, @@ -696,19 +698,19 @@ int mvchgat( { return(*(int *)0); } #undef mvdelch -int mvdelch( +int (mvdelch)( int a1, int z) { return(*(int *)0); } #undef mvgetch -int mvgetch( +int (mvgetch)( int a1, int z) { return(*(int *)0); } #undef mvgetnstr -int mvgetnstr( +int (mvgetnstr)( int a1, int a2, char *a3, @@ -716,14 +718,14 @@ int mvgetnstr( { return(*(int *)0); } #undef mvgetstr -int mvgetstr( +int (mvgetstr)( int a1, int a2, char *z) { return(*(int *)0); } #undef mvhline -int mvhline( +int (mvhline)( int a1, int a2, chtype a3, @@ -731,13 +733,13 @@ int mvhline( { return(*(int *)0); } #undef mvinch -chtype mvinch( +chtype (mvinch)( int a1, int z) { return(*(chtype *)0); } #undef mvinchnstr -int mvinchnstr( +int (mvinchnstr)( int a1, int a2, chtype *a3, @@ -745,14 +747,14 @@ int mvinchnstr( { return(*(int *)0); } #undef mvinchstr -int mvinchstr( +int (mvinchstr)( int a1, int a2, chtype *z) { return(*(int *)0); } #undef mvinnstr -int mvinnstr( +int (mvinnstr)( int a1, int a2, char *a3, @@ -760,14 +762,14 @@ int mvinnstr( { return(*(int *)0); } #undef mvinsch -int mvinsch( +int (mvinsch)( int a1, int a2, chtype z) { return(*(int *)0); } #undef mvinsnstr -int mvinsnstr( +int (mvinsnstr)( int a1, int a2, const char *a3, @@ -775,21 +777,21 @@ int mvinsnstr( { return(*(int *)0); } #undef mvinsstr -int mvinsstr( +int (mvinsstr)( int a1, int a2, const char *z) { return(*(int *)0); } #undef mvinstr -int mvinstr( +int (mvinstr)( int a1, int a2, char *z) { return(*(int *)0); } #undef mvvline -int mvvline( +int (mvvline)( int a1, int a2, chtype a3, @@ -797,7 +799,7 @@ int mvvline( { return(*(int *)0); } #undef mvwaddch -int mvwaddch( +int (mvwaddch)( WINDOW *a1, int a2, int a3, @@ -805,7 +807,7 @@ int mvwaddch( { return(*(int *)0); } #undef mvwaddchnstr -int mvwaddchnstr( +int (mvwaddchnstr)( WINDOW *a1, int a2, int a3, @@ -814,7 +816,7 @@ int mvwaddchnstr( { return(*(int *)0); } #undef mvwaddchstr -int mvwaddchstr( +int (mvwaddchstr)( WINDOW *a1, int a2, int a3, @@ -822,7 +824,7 @@ int mvwaddchstr( { return(*(int *)0); } #undef mvwaddnstr -int mvwaddnstr( +int (mvwaddnstr)( WINDOW *a1, int a2, int a3, @@ -831,7 +833,7 @@ int mvwaddnstr( { return(*(int *)0); } #undef mvwaddstr -int mvwaddstr( +int (mvwaddstr)( WINDOW *a1, int a2, int a3, @@ -839,7 +841,7 @@ int mvwaddstr( { return(*(int *)0); } #undef mvwchgat -int mvwchgat( +int (mvwchgat)( WINDOW *a1, int a2, int a3, @@ -850,21 +852,21 @@ int mvwchgat( { return(*(int *)0); } #undef mvwdelch -int mvwdelch( +int (mvwdelch)( WINDOW *a1, int a2, int z) { return(*(int *)0); } #undef mvwgetch -int mvwgetch( +int (mvwgetch)( WINDOW *a1, int a2, int z) { return(*(int *)0); } #undef mvwgetnstr -int mvwgetnstr( +int (mvwgetnstr)( WINDOW *a1, int a2, int a3, @@ -873,7 +875,7 @@ int mvwgetnstr( { return(*(int *)0); } #undef mvwgetstr -int mvwgetstr( +int (mvwgetstr)( WINDOW *a1, int a2, int a3, @@ -881,7 +883,7 @@ int mvwgetstr( { return(*(int *)0); } #undef mvwhline -int mvwhline( +int (mvwhline)( WINDOW *a1, int a2, int a3, @@ -890,14 +892,14 @@ int mvwhline( { return(*(int *)0); } #undef mvwinch -chtype mvwinch( +chtype (mvwinch)( WINDOW *a1, int a2, int z) { return(*(chtype *)0); } #undef mvwinchnstr -int mvwinchnstr( +int (mvwinchnstr)( WINDOW *a1, int a2, int a3, @@ -906,7 +908,7 @@ int mvwinchnstr( { return(*(int *)0); } #undef mvwinchstr -int mvwinchstr( +int (mvwinchstr)( WINDOW *a1, int a2, int a3, @@ -914,7 +916,7 @@ int mvwinchstr( { return(*(int *)0); } #undef mvwinnstr -int mvwinnstr( +int (mvwinnstr)( WINDOW *a1, int a2, int a3, @@ -923,7 +925,7 @@ int mvwinnstr( { return(*(int *)0); } #undef mvwinsch -int mvwinsch( +int (mvwinsch)( WINDOW *a1, int a2, int a3, @@ -931,7 +933,7 @@ int mvwinsch( { return(*(int *)0); } #undef mvwinsnstr -int mvwinsnstr( +int (mvwinsnstr)( WINDOW *a1, int a2, int a3, @@ -940,7 +942,7 @@ int mvwinsnstr( { return(*(int *)0); } #undef mvwinsstr -int mvwinsstr( +int (mvwinsstr)( WINDOW *a1, int a2, int a3, @@ -948,7 +950,7 @@ int mvwinsstr( { return(*(int *)0); } #undef mvwinstr -int mvwinstr( +int (mvwinstr)( WINDOW *a1, int a2, int a3, @@ -956,7 +958,7 @@ int mvwinstr( { return(*(int *)0); } #undef mvwvline -int mvwvline( +int (mvwvline)( WINDOW *a1, int a2, int a3, @@ -965,117 +967,117 @@ int mvwvline( { return(*(int *)0); } #undef PAIR_NUMBER -int PAIR_NUMBER( +int (PAIR_NUMBER)( int z) { return(*(int *)0); } #undef redrawwin -int redrawwin( +int (redrawwin)( WINDOW *z) { return(*(int *)0); } #undef refresh -int refresh(void) +int (refresh)(void) { return(*(int *)0); } #undef scrl -int scrl( +int (scrl)( int z) { return(*(int *)0); } #undef scroll -int scroll( +int (scroll)( WINDOW *z) { return(*(int *)0); } #undef setscrreg -int setscrreg( +int (setscrreg)( int a1, int z) { return(*(int *)0); } #undef standout -int standout(void) +int (standout)(void) { return(*(int *)0); } #undef standend -int standend(void) +int (standend)(void) { return(*(int *)0); } #undef timeout -void timeout( +void (timeout)( int z) { /* void */ } #undef touchline -int touchline( +int (touchline)( WINDOW *a1, int a2, int z) { return(*(int *)0); } #undef touchwin -int touchwin( +int (touchwin)( WINDOW *z) { return(*(int *)0); } #undef untouchwin -int untouchwin( +int (untouchwin)( WINDOW *z) { return(*(int *)0); } #undef vline -int vline( +int (vline)( chtype a1, int z) { return(*(int *)0); } #undef vw_printw -int vw_printw( +int (vw_printw)( WINDOW *a1, const char *a2, va_list z) { return(*(int *)0); } #undef vw_scanw -int vw_scanw( +int (vw_scanw)( WINDOW *a1, char *a2, va_list z) { return(*(int *)0); } #undef waddchstr -int waddchstr( +int (waddchstr)( WINDOW *a1, const chtype *z) { return(*(int *)0); } #undef waddstr -int waddstr( +int (waddstr)( WINDOW *a1, const char *z) { return(*(int *)0); } #undef wattron -int wattron( +int (wattron)( WINDOW *a1, int z) { return(*(int *)0); } #undef wattroff -int wattroff( +int (wattroff)( WINDOW *a1, int z) { return(*(int *)0); } #undef wattrset -int wattrset( +int (wattrset)( WINDOW *a1, int z) { return(*(int *)0); } #undef wattr_get -int wattr_get( +int (wattr_get)( WINDOW *a1, attr_t *a2, short *a3, @@ -1083,7 +1085,7 @@ int wattr_get( { return(*(int *)0); } #undef wattr_set -int wattr_set( +int (wattr_set)( WINDOW *a1, attr_t a2, short a3, @@ -1091,168 +1093,168 @@ int wattr_set( { return(*(int *)0); } #undef wdeleteln -int wdeleteln( +int (wdeleteln)( WINDOW *z) { return(*(int *)0); } #undef wgetstr -int wgetstr( +int (wgetstr)( WINDOW *a1, char *z) { return(*(int *)0); } #undef winchstr -int winchstr( +int (winchstr)( WINDOW *a1, chtype *z) { return(*(int *)0); } #undef winsertln -int winsertln( +int (winsertln)( WINDOW *z) { return(*(int *)0); } #undef winsstr -int winsstr( +int (winsstr)( WINDOW *a1, const char *z) { return(*(int *)0); } #undef winstr -int winstr( +int (winstr)( WINDOW *a1, char *z) { return(*(int *)0); } #undef wstandout -int wstandout( +int (wstandout)( WINDOW *z) { return(*(int *)0); } #undef wstandend -int wstandend( +int (wstandend)( WINDOW *z) { return(*(int *)0); } #undef getattrs -int getattrs( +int (getattrs)( const WINDOW *z) { return(*(int *)0); } #undef getcurx -int getcurx( +int (getcurx)( const WINDOW *z) { return(*(int *)0); } #undef getcury -int getcury( +int (getcury)( const WINDOW *z) { return(*(int *)0); } #undef getbegx -int getbegx( +int (getbegx)( const WINDOW *z) { return(*(int *)0); } #undef getbegy -int getbegy( +int (getbegy)( const WINDOW *z) { return(*(int *)0); } #undef getmaxx -int getmaxx( +int (getmaxx)( const WINDOW *z) { return(*(int *)0); } #undef getmaxy -int getmaxy( +int (getmaxy)( const WINDOW *z) { return(*(int *)0); } #undef getparx -int getparx( +int (getparx)( const WINDOW *z) { return(*(int *)0); } #undef getpary -int getpary( +int (getpary)( const WINDOW *z) { return(*(int *)0); } #undef wgetparent -WINDOW *wgetparent( +WINDOW *(wgetparent)( const WINDOW *z) { return(*(WINDOW **)0); } #undef is_cleared -NCURSES_BOOL is_cleared( +NCURSES_BOOL (is_cleared)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_idcok -NCURSES_BOOL is_idcok( +NCURSES_BOOL (is_idcok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_idlok -NCURSES_BOOL is_idlok( +NCURSES_BOOL (is_idlok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_immedok -NCURSES_BOOL is_immedok( +NCURSES_BOOL (is_immedok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_keypad -NCURSES_BOOL is_keypad( +NCURSES_BOOL (is_keypad)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_leaveok -NCURSES_BOOL is_leaveok( +NCURSES_BOOL (is_leaveok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_nodelay -NCURSES_BOOL is_nodelay( +NCURSES_BOOL (is_nodelay)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_notimeout -NCURSES_BOOL is_notimeout( +NCURSES_BOOL (is_notimeout)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_pad -NCURSES_BOOL is_pad( +NCURSES_BOOL (is_pad)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_scrollok -NCURSES_BOOL is_scrollok( +NCURSES_BOOL (is_scrollok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_subwin -NCURSES_BOOL is_subwin( +NCURSES_BOOL (is_subwin)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_syncok -NCURSES_BOOL is_syncok( +NCURSES_BOOL (is_syncok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef wgetscrreg -int wgetscrreg( +int (wgetscrreg)( const WINDOW *a1, int *a2, int *z) { return(*(int *)0); } #undef mouse_trafo -NCURSES_BOOL mouse_trafo( +NCURSES_BOOL (mouse_trafo)( int *a1, int *a2, NCURSES_BOOL z) @@ -1532,6 +1534,23 @@ void _nc_mvcur_wrap_sp( 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, @@ -1598,6 +1617,8 @@ SCREEN *newterm( /* ./base/lib_newwin.c */ +#include "/usr/lib/gcc/x86_64-linux-gnu/4.4.5/include/stddef.h" + #undef _nc_freewin int _nc_freewin( WINDOW *win) @@ -1987,7 +2008,7 @@ int _nc_setupscreen_sp( int slines, int scolumns, FILE *output, - NCURSES_BOOL filtered, + int filtered, int slk_format) { return(*(int *)0); } @@ -1996,7 +2017,7 @@ int _nc_setupscreen( int slines, int scolumns, FILE *output, - NCURSES_BOOL filtered, + int filtered, int slk_format) { return(*(int *)0); } @@ -2276,7 +2297,7 @@ char *_tracemouse( #undef _nc_signal_handler void _nc_signal_handler( - NCURSES_BOOL enable) + int enable) { /* void */ } /* ./base/lib_ungetch.c */ @@ -2513,12 +2534,6 @@ char *_nc_varargs( va_list ap) { return(*(char **)0); } -/* ./base/memmove.c */ - -#undef _nc_memmove -void _nc_memmove(void) - { /* void */ } - /* ./base/vsscanf.c */ #undef _nc_vsscanf @@ -2778,7 +2793,7 @@ void _nc_align_termtype( #undef _nc_copy_termtype void _nc_copy_termtype( TERMTYPE *dst, - TERMTYPE *src) + const TERMTYPE *src) { /* void */ } /* ./codes.c */ @@ -2882,6 +2897,8 @@ struct name_table_entry const *_nc_find_type_entry( /* ./tinfo/db_iterator.c */ +#include + #undef _nc_tic_dir const char *_nc_tic_dir( const char *path) @@ -2973,6 +2990,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 @@ -3313,7 +3336,7 @@ int _nc_putp_flush_sp( #undef _nc_keypad int _nc_keypad( SCREEN *sp, - NCURSES_BOOL flag) + int flag) { return(*(int *)0); } /* ./tinfo/lib_raw.c */ @@ -3444,17 +3467,17 @@ void use_env_sp( NCURSES_BOOL f) { /* void */ } -#undef use_env -void use_env( - 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) @@ -3481,7 +3504,7 @@ int _nc_setup_tinfo( #undef _nc_tinfo_cmdch void _nc_tinfo_cmdch( TERMINAL *termp, - char proto) + int proto) { /* void */ } #undef _nc_get_locale @@ -3502,7 +3525,7 @@ int _nc_setupterm( char *tname, int Filedes, int *errret, - NCURSES_BOOL reuse) + int reuse) { return(*(int *)0); } #undef new_prescr @@ -3641,7 +3664,7 @@ int _nc_tparm_err; int _nc_tparm_analyze( const char *string, char *p_is_s[9], - int *popcount) + int *_nc_popcount) { return(*(int *)0); } #undef tparm @@ -3661,7 +3684,7 @@ char *tiparm( #undef PC char PC; #undef ospeed -NCURSES_OSPEED ospeed; +short ospeed; #undef _nc_nulls_sent int _nc_nulls_sent; @@ -3701,12 +3724,28 @@ 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, @@ -3714,11 +3753,6 @@ int _nc_putp_sp( const char *string) { return(*(int *)0); } -#undef putp -int putp( - const char *string) - { return(*(int *)0); } - #undef _nc_putp int _nc_putp( const char *name, @@ -3783,12 +3817,12 @@ void _tracef( #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( - char code) + int code) { return(*(char *)0); } #undef _nc_retrace_int @@ -4044,10 +4078,30 @@ char *const *_nc_strnames(void) char *const *_nc_strfnames(void) { return(*(char **)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 +#undef _nc_init_termtype +void _nc_init_termtype( + TERMTYPE *const tp) + { /* void */ } + #undef _nc_read_termtype int _nc_read_termtype( TERMTYPE *ptr, @@ -4072,25 +4126,8 @@ int _nc_read_entry( #include -#undef _nc_read_termcap_entry -int _nc_read_termcap_entry( - const char *const tn, - TERMTYPE *const tp) - { return(*(int *)0); } - -/* ./tinfo/setbuf.c */ - -#undef _nc_set_buffer_sp -void _nc_set_buffer_sp( - SCREEN *sp, - FILE *ofp, - NCURSES_BOOL buffered) - { /* void */ } - -#undef _nc_set_buffer -void _nc_set_buffer( - FILE *ofp, - NCURSES_BOOL buffered) +#undef _nc_read_termcap +void _nc_read_termcap(void) { /* void */ } /* ./tinfo/strings.c */ @@ -4316,6 +4353,8 @@ int _nc_resolve_uses( #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 diff --git a/ncurses/llib-lncursestw b/ncurses/llib-lncursestw index 59878097..b1919c43 100644 --- a/ncurses/llib-lncursestw +++ b/ncurses/llib-lncursestw @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2009-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 2009-2011,2013 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 +27,7 @@ ****************************************************************************/ /**************************************************************************** - * Author: Thomas E. Dickey 2009-2010,2011 * + * Author: Thomas E. Dickey 2009-on * ****************************************************************************/ /* LINTLIBRARY */ @@ -369,17 +369,17 @@ int pair_content( #undef _nc_do_color_sp void _nc_do_color_sp( SCREEN *sp, - short old_pair, - short pair, - NCURSES_BOOL reverse, + 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 old_pair, + int pair, + int reverse, NCURSES_OUTC outc) { /* void */ } @@ -457,86 +457,88 @@ int flash(void) /* ./lib_gen.c */ +#include + #undef addch -int addch( +int (addch)( const chtype z) { return(*(int *)0); } #undef addchnstr -int addchnstr( +int (addchnstr)( const chtype *a1, int z) { return(*(int *)0); } #undef addchstr -int addchstr( +int (addchstr)( const chtype *z) { return(*(int *)0); } #undef addnstr -int addnstr( +int (addnstr)( const char *a1, int z) { return(*(int *)0); } #undef addstr -int addstr( +int (addstr)( const char *z) { return(*(int *)0); } #undef attroff -int attroff( - NCURSES_ATTR_T z) +int (attroff)( + int z) { return(*(int *)0); } #undef attron -int attron( - NCURSES_ATTR_T z) +int (attron)( + int z) { return(*(int *)0); } #undef attrset -int attrset( - NCURSES_ATTR_T z) +int (attrset)( + int z) { return(*(int *)0); } #undef attr_get -int attr_get( +int (attr_get)( attr_t *a1, short *a2, void *z) { return(*(int *)0); } #undef attr_off -int attr_off( +int (attr_off)( attr_t a1, void *z) { return(*(int *)0); } #undef attr_on -int attr_on( +int (attr_on)( attr_t a1, void *z) { return(*(int *)0); } #undef attr_set -int attr_set( +int (attr_set)( attr_t a1, short a2, void *z) { return(*(int *)0); } #undef bkgd -int bkgd( +int (bkgd)( chtype z) { return(*(int *)0); } #undef bkgdset -void bkgdset( +void (bkgdset)( chtype z) { /* void */ } #undef border -int border( +int (border)( chtype a1, chtype a2, chtype a3, @@ -548,14 +550,14 @@ int border( { return(*(int *)0); } #undef box -int box( +int (box)( WINDOW *a1, chtype a2, chtype z) { return(*(int *)0); } #undef chgat -int chgat( +int (chgat)( int a1, attr_t a2, short a3, @@ -563,137 +565,137 @@ int chgat( { return(*(int *)0); } #undef clear -int clear(void) +int (clear)(void) { return(*(int *)0); } #undef clrtobot -int clrtobot(void) +int (clrtobot)(void) { return(*(int *)0); } #undef clrtoeol -int clrtoeol(void) +int (clrtoeol)(void) { return(*(int *)0); } #undef color_set -int color_set( +int (color_set)( short a1, void *z) { return(*(int *)0); } #undef COLOR_PAIR -int COLOR_PAIR( +int (COLOR_PAIR)( int z) { return(*(int *)0); } #undef delch -int delch(void) +int (delch)(void) { return(*(int *)0); } #undef deleteln -int deleteln(void) +int (deleteln)(void) { return(*(int *)0); } #undef echochar -int echochar( +int (echochar)( const chtype z) { return(*(int *)0); } #undef erase -int erase(void) +int (erase)(void) { return(*(int *)0); } #undef getbkgd -chtype getbkgd( +chtype (getbkgd)( WINDOW *z) { return(*(chtype *)0); } #undef getch -int getch(void) +int (getch)(void) { return(*(int *)0); } #undef getnstr -int getnstr( +int (getnstr)( char *a1, int z) { return(*(int *)0); } #undef getstr -int getstr( +int (getstr)( char *z) { return(*(int *)0); } #undef hline -int hline( +int (hline)( chtype a1, int z) { return(*(int *)0); } #undef inch -chtype inch(void) +chtype (inch)(void) { return(*(chtype *)0); } #undef inchnstr -int inchnstr( +int (inchnstr)( chtype *a1, int z) { return(*(int *)0); } #undef inchstr -int inchstr( +int (inchstr)( chtype *z) { return(*(int *)0); } #undef innstr -int innstr( +int (innstr)( char *a1, int z) { return(*(int *)0); } #undef insch -int insch( +int (insch)( chtype z) { return(*(int *)0); } #undef insdelln -int insdelln( +int (insdelln)( int z) { return(*(int *)0); } #undef insertln -int insertln(void) +int (insertln)(void) { return(*(int *)0); } #undef insnstr -int insnstr( +int (insnstr)( const char *a1, int z) { return(*(int *)0); } #undef insstr -int insstr( +int (insstr)( const char *z) { return(*(int *)0); } #undef instr -int instr( +int (instr)( char *z) { return(*(int *)0); } #undef move -int move( +int (move)( int a1, int z) { return(*(int *)0); } #undef mvaddch -int mvaddch( +int (mvaddch)( int a1, int a2, const chtype z) { return(*(int *)0); } #undef mvaddchnstr -int mvaddchnstr( +int (mvaddchnstr)( int a1, int a2, const chtype *a3, @@ -701,14 +703,14 @@ int mvaddchnstr( { return(*(int *)0); } #undef mvaddchstr -int mvaddchstr( +int (mvaddchstr)( int a1, int a2, const chtype *z) { return(*(int *)0); } #undef mvaddnstr -int mvaddnstr( +int (mvaddnstr)( int a1, int a2, const char *a3, @@ -716,14 +718,14 @@ int mvaddnstr( { return(*(int *)0); } #undef mvaddstr -int mvaddstr( +int (mvaddstr)( int a1, int a2, const char *z) { return(*(int *)0); } #undef mvchgat -int mvchgat( +int (mvchgat)( int a1, int a2, int a3, @@ -733,19 +735,19 @@ int mvchgat( { return(*(int *)0); } #undef mvdelch -int mvdelch( +int (mvdelch)( int a1, int z) { return(*(int *)0); } #undef mvgetch -int mvgetch( +int (mvgetch)( int a1, int z) { return(*(int *)0); } #undef mvgetnstr -int mvgetnstr( +int (mvgetnstr)( int a1, int a2, char *a3, @@ -753,14 +755,14 @@ int mvgetnstr( { return(*(int *)0); } #undef mvgetstr -int mvgetstr( +int (mvgetstr)( int a1, int a2, char *z) { return(*(int *)0); } #undef mvhline -int mvhline( +int (mvhline)( int a1, int a2, chtype a3, @@ -768,13 +770,13 @@ int mvhline( { return(*(int *)0); } #undef mvinch -chtype mvinch( +chtype (mvinch)( int a1, int z) { return(*(chtype *)0); } #undef mvinchnstr -int mvinchnstr( +int (mvinchnstr)( int a1, int a2, chtype *a3, @@ -782,14 +784,14 @@ int mvinchnstr( { return(*(int *)0); } #undef mvinchstr -int mvinchstr( +int (mvinchstr)( int a1, int a2, chtype *z) { return(*(int *)0); } #undef mvinnstr -int mvinnstr( +int (mvinnstr)( int a1, int a2, char *a3, @@ -797,14 +799,14 @@ int mvinnstr( { return(*(int *)0); } #undef mvinsch -int mvinsch( +int (mvinsch)( int a1, int a2, chtype z) { return(*(int *)0); } #undef mvinsnstr -int mvinsnstr( +int (mvinsnstr)( int a1, int a2, const char *a3, @@ -812,21 +814,21 @@ int mvinsnstr( { return(*(int *)0); } #undef mvinsstr -int mvinsstr( +int (mvinsstr)( int a1, int a2, const char *z) { return(*(int *)0); } #undef mvinstr -int mvinstr( +int (mvinstr)( int a1, int a2, char *z) { return(*(int *)0); } #undef mvvline -int mvvline( +int (mvvline)( int a1, int a2, chtype a3, @@ -834,7 +836,7 @@ int mvvline( { return(*(int *)0); } #undef mvwaddch -int mvwaddch( +int (mvwaddch)( WINDOW *a1, int a2, int a3, @@ -842,7 +844,7 @@ int mvwaddch( { return(*(int *)0); } #undef mvwaddchnstr -int mvwaddchnstr( +int (mvwaddchnstr)( WINDOW *a1, int a2, int a3, @@ -851,7 +853,7 @@ int mvwaddchnstr( { return(*(int *)0); } #undef mvwaddchstr -int mvwaddchstr( +int (mvwaddchstr)( WINDOW *a1, int a2, int a3, @@ -859,7 +861,7 @@ int mvwaddchstr( { return(*(int *)0); } #undef mvwaddnstr -int mvwaddnstr( +int (mvwaddnstr)( WINDOW *a1, int a2, int a3, @@ -868,7 +870,7 @@ int mvwaddnstr( { return(*(int *)0); } #undef mvwaddstr -int mvwaddstr( +int (mvwaddstr)( WINDOW *a1, int a2, int a3, @@ -876,7 +878,7 @@ int mvwaddstr( { return(*(int *)0); } #undef mvwchgat -int mvwchgat( +int (mvwchgat)( WINDOW *a1, int a2, int a3, @@ -887,21 +889,21 @@ int mvwchgat( { return(*(int *)0); } #undef mvwdelch -int mvwdelch( +int (mvwdelch)( WINDOW *a1, int a2, int z) { return(*(int *)0); } #undef mvwgetch -int mvwgetch( +int (mvwgetch)( WINDOW *a1, int a2, int z) { return(*(int *)0); } #undef mvwgetnstr -int mvwgetnstr( +int (mvwgetnstr)( WINDOW *a1, int a2, int a3, @@ -910,7 +912,7 @@ int mvwgetnstr( { return(*(int *)0); } #undef mvwgetstr -int mvwgetstr( +int (mvwgetstr)( WINDOW *a1, int a2, int a3, @@ -918,7 +920,7 @@ int mvwgetstr( { return(*(int *)0); } #undef mvwhline -int mvwhline( +int (mvwhline)( WINDOW *a1, int a2, int a3, @@ -927,14 +929,14 @@ int mvwhline( { return(*(int *)0); } #undef mvwinch -chtype mvwinch( +chtype (mvwinch)( WINDOW *a1, int a2, int z) { return(*(chtype *)0); } #undef mvwinchnstr -int mvwinchnstr( +int (mvwinchnstr)( WINDOW *a1, int a2, int a3, @@ -943,7 +945,7 @@ int mvwinchnstr( { return(*(int *)0); } #undef mvwinchstr -int mvwinchstr( +int (mvwinchstr)( WINDOW *a1, int a2, int a3, @@ -951,7 +953,7 @@ int mvwinchstr( { return(*(int *)0); } #undef mvwinnstr -int mvwinnstr( +int (mvwinnstr)( WINDOW *a1, int a2, int a3, @@ -960,7 +962,7 @@ int mvwinnstr( { return(*(int *)0); } #undef mvwinsch -int mvwinsch( +int (mvwinsch)( WINDOW *a1, int a2, int a3, @@ -968,7 +970,7 @@ int mvwinsch( { return(*(int *)0); } #undef mvwinsnstr -int mvwinsnstr( +int (mvwinsnstr)( WINDOW *a1, int a2, int a3, @@ -977,7 +979,7 @@ int mvwinsnstr( { return(*(int *)0); } #undef mvwinsstr -int mvwinsstr( +int (mvwinsstr)( WINDOW *a1, int a2, int a3, @@ -985,7 +987,7 @@ int mvwinsstr( { return(*(int *)0); } #undef mvwinstr -int mvwinstr( +int (mvwinstr)( WINDOW *a1, int a2, int a3, @@ -993,7 +995,7 @@ int mvwinstr( { return(*(int *)0); } #undef mvwvline -int mvwvline( +int (mvwvline)( WINDOW *a1, int a2, int a3, @@ -1002,129 +1004,129 @@ int mvwvline( { return(*(int *)0); } #undef PAIR_NUMBER -int PAIR_NUMBER( +int (PAIR_NUMBER)( int z) { return(*(int *)0); } #undef redrawwin -int redrawwin( +int (redrawwin)( WINDOW *z) { return(*(int *)0); } #undef refresh -int refresh(void) +int (refresh)(void) { return(*(int *)0); } #undef scrl -int scrl( +int (scrl)( int z) { return(*(int *)0); } #undef scroll -int scroll( +int (scroll)( WINDOW *z) { return(*(int *)0); } #undef setscrreg -int setscrreg( +int (setscrreg)( int a1, int z) { return(*(int *)0); } #undef slk_attr_off -int slk_attr_off( +int (slk_attr_off)( const attr_t a1, void *z) { return(*(int *)0); } #undef slk_attr_on -int slk_attr_on( +int (slk_attr_on)( attr_t a1, void *z) { return(*(int *)0); } #undef standout -int standout(void) +int (standout)(void) { return(*(int *)0); } #undef standend -int standend(void) +int (standend)(void) { return(*(int *)0); } #undef timeout -void timeout( +void (timeout)( int z) { /* void */ } #undef touchline -int touchline( +int (touchline)( WINDOW *a1, int a2, int z) { return(*(int *)0); } #undef touchwin -int touchwin( +int (touchwin)( WINDOW *z) { return(*(int *)0); } #undef untouchwin -int untouchwin( +int (untouchwin)( WINDOW *z) { return(*(int *)0); } #undef vline -int vline( +int (vline)( chtype a1, int z) { return(*(int *)0); } #undef vw_printw -int vw_printw( +int (vw_printw)( WINDOW *a1, const char *a2, va_list z) { return(*(int *)0); } #undef vw_scanw -int vw_scanw( +int (vw_scanw)( WINDOW *a1, char *a2, va_list z) { return(*(int *)0); } #undef waddchstr -int waddchstr( +int (waddchstr)( WINDOW *a1, const chtype *z) { return(*(int *)0); } #undef waddstr -int waddstr( +int (waddstr)( WINDOW *a1, const char *z) { return(*(int *)0); } #undef wattron -int wattron( +int (wattron)( WINDOW *a1, int z) { return(*(int *)0); } #undef wattroff -int wattroff( +int (wattroff)( WINDOW *a1, int z) { return(*(int *)0); } #undef wattrset -int wattrset( +int (wattrset)( WINDOW *a1, int z) { return(*(int *)0); } #undef wattr_get -int wattr_get( +int (wattr_get)( WINDOW *a1, attr_t *a2, short *a3, @@ -1132,7 +1134,7 @@ int wattr_get( { return(*(int *)0); } #undef wattr_set -int wattr_set( +int (wattr_set)( WINDOW *a1, attr_t a2, short a3, @@ -1140,205 +1142,205 @@ int wattr_set( { return(*(int *)0); } #undef wdeleteln -int wdeleteln( +int (wdeleteln)( WINDOW *z) { return(*(int *)0); } #undef wgetstr -int wgetstr( +int (wgetstr)( WINDOW *a1, char *z) { return(*(int *)0); } #undef winchstr -int winchstr( +int (winchstr)( WINDOW *a1, chtype *z) { return(*(int *)0); } #undef winsertln -int winsertln( +int (winsertln)( WINDOW *z) { return(*(int *)0); } #undef winsstr -int winsstr( +int (winsstr)( WINDOW *a1, const char *z) { return(*(int *)0); } #undef winstr -int winstr( +int (winstr)( WINDOW *a1, char *z) { return(*(int *)0); } #undef wstandout -int wstandout( +int (wstandout)( WINDOW *z) { return(*(int *)0); } #undef wstandend -int wstandend( +int (wstandend)( WINDOW *z) { return(*(int *)0); } #undef getattrs -int getattrs( +int (getattrs)( const WINDOW *z) { return(*(int *)0); } #undef getcurx -int getcurx( +int (getcurx)( const WINDOW *z) { return(*(int *)0); } #undef getcury -int getcury( +int (getcury)( const WINDOW *z) { return(*(int *)0); } #undef getbegx -int getbegx( +int (getbegx)( const WINDOW *z) { return(*(int *)0); } #undef getbegy -int getbegy( +int (getbegy)( const WINDOW *z) { return(*(int *)0); } #undef getmaxx -int getmaxx( +int (getmaxx)( const WINDOW *z) { return(*(int *)0); } #undef getmaxy -int getmaxy( +int (getmaxy)( const WINDOW *z) { return(*(int *)0); } #undef getparx -int getparx( +int (getparx)( const WINDOW *z) { return(*(int *)0); } #undef getpary -int getpary( +int (getpary)( const WINDOW *z) { return(*(int *)0); } #undef wgetparent -WINDOW *wgetparent( +WINDOW *(wgetparent)( const WINDOW *z) { return(*(WINDOW **)0); } #undef is_cleared -NCURSES_BOOL is_cleared( +NCURSES_BOOL (is_cleared)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_idcok -NCURSES_BOOL is_idcok( +NCURSES_BOOL (is_idcok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_idlok -NCURSES_BOOL is_idlok( +NCURSES_BOOL (is_idlok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_immedok -NCURSES_BOOL is_immedok( +NCURSES_BOOL (is_immedok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_keypad -NCURSES_BOOL is_keypad( +NCURSES_BOOL (is_keypad)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_leaveok -NCURSES_BOOL is_leaveok( +NCURSES_BOOL (is_leaveok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_nodelay -NCURSES_BOOL is_nodelay( +NCURSES_BOOL (is_nodelay)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_notimeout -NCURSES_BOOL is_notimeout( +NCURSES_BOOL (is_notimeout)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_pad -NCURSES_BOOL is_pad( +NCURSES_BOOL (is_pad)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_scrollok -NCURSES_BOOL is_scrollok( +NCURSES_BOOL (is_scrollok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_subwin -NCURSES_BOOL is_subwin( +NCURSES_BOOL (is_subwin)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_syncok -NCURSES_BOOL is_syncok( +NCURSES_BOOL (is_syncok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef wgetscrreg -int wgetscrreg( +int (wgetscrreg)( const WINDOW *a1, int *a2, int *z) { return(*(int *)0); } #undef add_wch -int add_wch( +int (add_wch)( const cchar_t *z) { return(*(int *)0); } #undef add_wchnstr -int add_wchnstr( +int (add_wchnstr)( const cchar_t *a1, int z) { return(*(int *)0); } #undef add_wchstr -int add_wchstr( +int (add_wchstr)( const cchar_t *z) { return(*(int *)0); } #undef addnwstr -int addnwstr( +int (addnwstr)( const wchar_t *a1, int z) { return(*(int *)0); } #undef addwstr -int addwstr( +int (addwstr)( const wchar_t *z) { return(*(int *)0); } #undef bkgrnd -int bkgrnd( +int (bkgrnd)( const cchar_t *z) { return(*(int *)0); } #undef bkgrndset -void bkgrndset( +void (bkgrndset)( const cchar_t *z) { /* void */ } #undef border_set -int border_set( +int (border_set)( const cchar_t *a1, const cchar_t *a2, const cchar_t *a3, @@ -1350,96 +1352,96 @@ int border_set( { return(*(int *)0); } #undef box_set -int box_set( +int (box_set)( WINDOW *a1, const cchar_t *a2, const cchar_t *z) { return(*(int *)0); } #undef echo_wchar -int echo_wchar( +int (echo_wchar)( const cchar_t *z) { return(*(int *)0); } #undef get_wch -int get_wch( +int (get_wch)( wint_t *z) { return(*(int *)0); } #undef get_wstr -int get_wstr( +int (get_wstr)( wint_t *z) { return(*(int *)0); } #undef getbkgrnd -int getbkgrnd( +int (getbkgrnd)( cchar_t *z) { return(*(int *)0); } #undef getn_wstr -int getn_wstr( +int (getn_wstr)( wint_t *a1, int z) { return(*(int *)0); } #undef hline_set -int hline_set( +int (hline_set)( const cchar_t *a1, int z) { return(*(int *)0); } #undef in_wch -int in_wch( +int (in_wch)( cchar_t *z) { return(*(int *)0); } #undef in_wchnstr -int in_wchnstr( +int (in_wchnstr)( cchar_t *a1, int z) { return(*(int *)0); } #undef in_wchstr -int in_wchstr( +int (in_wchstr)( cchar_t *z) { return(*(int *)0); } #undef innwstr -int innwstr( +int (innwstr)( wchar_t *a1, int z) { return(*(int *)0); } #undef ins_nwstr -int ins_nwstr( +int (ins_nwstr)( const wchar_t *a1, int z) { return(*(int *)0); } #undef ins_wch -int ins_wch( +int (ins_wch)( const cchar_t *z) { return(*(int *)0); } #undef ins_wstr -int ins_wstr( +int (ins_wstr)( const wchar_t *z) { return(*(int *)0); } #undef inwstr -int inwstr( +int (inwstr)( wchar_t *z) { return(*(int *)0); } #undef mvadd_wch -int mvadd_wch( +int (mvadd_wch)( int a1, int a2, const cchar_t *z) { return(*(int *)0); } #undef mvadd_wchnstr -int mvadd_wchnstr( +int (mvadd_wchnstr)( int a1, int a2, const cchar_t *a3, @@ -1447,14 +1449,14 @@ int mvadd_wchnstr( { return(*(int *)0); } #undef mvadd_wchstr -int mvadd_wchstr( +int (mvadd_wchstr)( int a1, int a2, const cchar_t *z) { return(*(int *)0); } #undef mvaddnwstr -int mvaddnwstr( +int (mvaddnwstr)( int a1, int a2, const wchar_t *a3, @@ -1462,28 +1464,28 @@ int mvaddnwstr( { return(*(int *)0); } #undef mvaddwstr -int mvaddwstr( +int (mvaddwstr)( int a1, int a2, const wchar_t *z) { return(*(int *)0); } #undef mvget_wch -int mvget_wch( +int (mvget_wch)( int a1, int a2, wint_t *z) { return(*(int *)0); } #undef mvget_wstr -int mvget_wstr( +int (mvget_wstr)( int a1, int a2, wint_t *z) { return(*(int *)0); } #undef mvgetn_wstr -int mvgetn_wstr( +int (mvgetn_wstr)( int a1, int a2, wint_t *a3, @@ -1491,7 +1493,7 @@ int mvgetn_wstr( { return(*(int *)0); } #undef mvhline_set -int mvhline_set( +int (mvhline_set)( int a1, int a2, const cchar_t *a3, @@ -1499,14 +1501,14 @@ int mvhline_set( { return(*(int *)0); } #undef mvin_wch -int mvin_wch( +int (mvin_wch)( int a1, int a2, cchar_t *z) { return(*(int *)0); } #undef mvin_wchnstr -int mvin_wchnstr( +int (mvin_wchnstr)( int a1, int a2, cchar_t *a3, @@ -1514,14 +1516,14 @@ int mvin_wchnstr( { return(*(int *)0); } #undef mvin_wchstr -int mvin_wchstr( +int (mvin_wchstr)( int a1, int a2, cchar_t *z) { return(*(int *)0); } #undef mvinnwstr -int mvinnwstr( +int (mvinnwstr)( int a1, int a2, wchar_t *a3, @@ -1529,7 +1531,7 @@ int mvinnwstr( { return(*(int *)0); } #undef mvins_nwstr -int mvins_nwstr( +int (mvins_nwstr)( int a1, int a2, const wchar_t *a3, @@ -1537,28 +1539,28 @@ int mvins_nwstr( { return(*(int *)0); } #undef mvins_wch -int mvins_wch( +int (mvins_wch)( int a1, int a2, const cchar_t *z) { return(*(int *)0); } #undef mvins_wstr -int mvins_wstr( +int (mvins_wstr)( int a1, int a2, const wchar_t *z) { return(*(int *)0); } #undef mvinwstr -int mvinwstr( +int (mvinwstr)( int a1, int a2, wchar_t *z) { return(*(int *)0); } #undef mvvline_set -int mvvline_set( +int (mvvline_set)( int a1, int a2, const cchar_t *a3, @@ -1566,7 +1568,7 @@ int mvvline_set( { return(*(int *)0); } #undef mvwadd_wch -int mvwadd_wch( +int (mvwadd_wch)( WINDOW *a1, int a2, int a3, @@ -1574,7 +1576,7 @@ int mvwadd_wch( { return(*(int *)0); } #undef mvwadd_wchnstr -int mvwadd_wchnstr( +int (mvwadd_wchnstr)( WINDOW *a1, int a2, int a3, @@ -1583,7 +1585,7 @@ int mvwadd_wchnstr( { return(*(int *)0); } #undef mvwadd_wchstr -int mvwadd_wchstr( +int (mvwadd_wchstr)( WINDOW *a1, int a2, int a3, @@ -1591,7 +1593,7 @@ int mvwadd_wchstr( { return(*(int *)0); } #undef mvwaddnwstr -int mvwaddnwstr( +int (mvwaddnwstr)( WINDOW *a1, int a2, int a3, @@ -1600,7 +1602,7 @@ int mvwaddnwstr( { return(*(int *)0); } #undef mvwaddwstr -int mvwaddwstr( +int (mvwaddwstr)( WINDOW *a1, int a2, int a3, @@ -1608,7 +1610,7 @@ int mvwaddwstr( { return(*(int *)0); } #undef mvwget_wch -int mvwget_wch( +int (mvwget_wch)( WINDOW *a1, int a2, int a3, @@ -1616,7 +1618,7 @@ int mvwget_wch( { return(*(int *)0); } #undef mvwget_wstr -int mvwget_wstr( +int (mvwget_wstr)( WINDOW *a1, int a2, int a3, @@ -1624,7 +1626,7 @@ int mvwget_wstr( { return(*(int *)0); } #undef mvwgetn_wstr -int mvwgetn_wstr( +int (mvwgetn_wstr)( WINDOW *a1, int a2, int a3, @@ -1633,7 +1635,7 @@ int mvwgetn_wstr( { return(*(int *)0); } #undef mvwhline_set -int mvwhline_set( +int (mvwhline_set)( WINDOW *a1, int a2, int a3, @@ -1642,7 +1644,7 @@ int mvwhline_set( { return(*(int *)0); } #undef mvwin_wch -int mvwin_wch( +int (mvwin_wch)( WINDOW *a1, int a2, int a3, @@ -1650,7 +1652,7 @@ int mvwin_wch( { return(*(int *)0); } #undef mvwin_wchnstr -int mvwin_wchnstr( +int (mvwin_wchnstr)( WINDOW *a1, int a2, int a3, @@ -1659,7 +1661,7 @@ int mvwin_wchnstr( { return(*(int *)0); } #undef mvwin_wchstr -int mvwin_wchstr( +int (mvwin_wchstr)( WINDOW *a1, int a2, int a3, @@ -1667,7 +1669,7 @@ int mvwin_wchstr( { return(*(int *)0); } #undef mvwinnwstr -int mvwinnwstr( +int (mvwinnwstr)( WINDOW *a1, int a2, int a3, @@ -1676,7 +1678,7 @@ int mvwinnwstr( { return(*(int *)0); } #undef mvwins_nwstr -int mvwins_nwstr( +int (mvwins_nwstr)( WINDOW *a1, int a2, int a3, @@ -1685,7 +1687,7 @@ int mvwins_nwstr( { return(*(int *)0); } #undef mvwins_wch -int mvwins_wch( +int (mvwins_wch)( WINDOW *a1, int a2, int a3, @@ -1693,7 +1695,7 @@ int mvwins_wch( { return(*(int *)0); } #undef mvwins_wstr -int mvwins_wstr( +int (mvwins_wstr)( WINDOW *a1, int a2, int a3, @@ -1701,7 +1703,7 @@ int mvwins_wstr( { return(*(int *)0); } #undef mvwinwstr -int mvwinwstr( +int (mvwinwstr)( WINDOW *a1, int a2, int a3, @@ -1709,7 +1711,7 @@ int mvwinwstr( { return(*(int *)0); } #undef mvwvline_set -int mvwvline_set( +int (mvwvline_set)( WINDOW *a1, int a2, int a3, @@ -1718,49 +1720,49 @@ int mvwvline_set( { return(*(int *)0); } #undef vline_set -int vline_set( +int (vline_set)( const cchar_t *a1, int z) { return(*(int *)0); } #undef wadd_wchstr -int wadd_wchstr( +int (wadd_wchstr)( WINDOW *a1, const cchar_t *z) { return(*(int *)0); } #undef waddwstr -int waddwstr( +int (waddwstr)( WINDOW *a1, const wchar_t *z) { return(*(int *)0); } #undef wget_wstr -int wget_wstr( +int (wget_wstr)( WINDOW *a1, wint_t *z) { return(*(int *)0); } #undef wgetbkgrnd -int wgetbkgrnd( +int (wgetbkgrnd)( WINDOW *a1, cchar_t *z) { return(*(int *)0); } #undef win_wchstr -int win_wchstr( +int (win_wchstr)( WINDOW *a1, cchar_t *z) { return(*(int *)0); } #undef wins_wstr -int wins_wstr( +int (wins_wstr)( WINDOW *a1, const wchar_t *z) { return(*(int *)0); } #undef mouse_trafo -NCURSES_BOOL mouse_trafo( +NCURSES_BOOL (mouse_trafo)( int *a1, int *a2, NCURSES_BOOL z) @@ -2040,6 +2042,23 @@ void _nc_mvcur_wrap_sp( 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, @@ -2106,6 +2125,8 @@ SCREEN *newterm( /* ./base/lib_newwin.c */ +#include "/usr/lib/gcc/x86_64-linux-gnu/4.4.5/include/stddef.h" + #undef _nc_freewin int _nc_freewin( WINDOW *win) @@ -2495,7 +2516,7 @@ int _nc_setupscreen_sp( int slines, int scolumns, FILE *output, - NCURSES_BOOL filtered, + int filtered, int slk_format) { return(*(int *)0); } @@ -2504,7 +2525,7 @@ int _nc_setupscreen( int slines, int scolumns, FILE *output, - NCURSES_BOOL filtered, + int filtered, int slk_format) { return(*(int *)0); } @@ -2786,7 +2807,7 @@ char *_tracemouse( #undef _nc_signal_handler void _nc_signal_handler( - NCURSES_BOOL enable) + int enable) { /* void */ } /* ./base/lib_ungetch.c */ @@ -3023,12 +3044,6 @@ char *_nc_varargs( va_list ap) { return(*(char **)0); } -/* ./base/memmove.c */ - -#undef _nc_memmove -void _nc_memmove(void) - { /* void */ } - /* ./base/vsscanf.c */ #undef _nc_vsscanf @@ -3563,7 +3578,7 @@ void _nc_align_termtype( #undef _nc_copy_termtype void _nc_copy_termtype( TERMTYPE *dst, - TERMTYPE *src) + const TERMTYPE *src) { /* void */ } /* ./codes.c */ @@ -3667,6 +3682,8 @@ struct name_table_entry const *_nc_find_type_entry( /* ./tinfo/db_iterator.c */ +#include + #undef _nc_tic_dir const char *_nc_tic_dir( const char *path) @@ -3758,6 +3775,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 @@ -4098,7 +4121,7 @@ int _nc_putp_flush_sp( #undef _nc_keypad int _nc_keypad( SCREEN *sp, - NCURSES_BOOL flag) + int flag) { return(*(int *)0); } /* ./tinfo/lib_raw.c */ @@ -4229,19 +4252,19 @@ void use_env_sp( NCURSES_BOOL f) { /* void */ } -#undef use_env -void use_env( - NCURSES_BOOL f) - { /* void */ } - #undef use_tioctl_sp void use_tioctl_sp( SCREEN *sp, NCURSES_BOOL f) { /* void */ } -#undef use_tioct -void use_tioct( +#undef use_env +void use_env( + NCURSES_BOOL f) + { /* void */ } + +#undef use_tioctl +void use_tioctl( NCURSES_BOOL f) { /* void */ } @@ -4266,7 +4289,7 @@ int _nc_setup_tinfo( #undef _nc_tinfo_cmdch void _nc_tinfo_cmdch( TERMINAL *termp, - char proto) + int proto) { /* void */ } #undef _nc_get_locale @@ -4287,7 +4310,7 @@ int _nc_setupterm( char *tname, int Filedes, int *errret, - NCURSES_BOOL reuse) + int reuse) { return(*(int *)0); } #undef new_prescr @@ -4426,7 +4449,7 @@ int _nc_tparm_err; int _nc_tparm_analyze( const char *string, char *p_is_s[9], - int *popcount) + int *_nc_popcount) { return(*(int *)0); } #undef tparm @@ -4446,7 +4469,7 @@ char *tiparm( #undef PC char PC; #undef ospeed -NCURSES_OSPEED ospeed; +short ospeed; #undef _nc_nulls_sent int _nc_nulls_sent; @@ -4486,12 +4509,28 @@ 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, @@ -4499,11 +4538,6 @@ int _nc_putp_sp( const char *string) { return(*(int *)0); } -#undef putp -int putp( - const char *string) - { return(*(int *)0); } - #undef _nc_putp int _nc_putp( const char *name, @@ -4568,12 +4602,12 @@ void _tracef( #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( - char code) + int code) { return(*(char *)0); } #undef _nc_retrace_int @@ -4840,10 +4874,30 @@ char *const *_nc_strnames(void) char *const *_nc_strfnames(void) { return(*(char **)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 +#undef _nc_init_termtype +void _nc_init_termtype( + TERMTYPE *const tp) + { /* void */ } + #undef _nc_read_termtype int _nc_read_termtype( TERMTYPE *ptr, @@ -4868,25 +4922,8 @@ int _nc_read_entry( #include -#undef _nc_read_termcap_entry -int _nc_read_termcap_entry( - const char *const tn, - TERMTYPE *const tp) - { return(*(int *)0); } - -/* ./tinfo/setbuf.c */ - -#undef _nc_set_buffer_sp -void _nc_set_buffer_sp( - SCREEN *sp, - FILE *ofp, - NCURSES_BOOL buffered) - { /* void */ } - -#undef _nc_set_buffer -void _nc_set_buffer( - FILE *ofp, - NCURSES_BOOL buffered) +#undef _nc_read_termcap +void _nc_read_termcap(void) { /* void */ } /* ./tinfo/strings.c */ @@ -5134,6 +5171,8 @@ int _nc_resolve_uses( #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 diff --git a/ncurses/llib-lncursesw b/ncurses/llib-lncursesw index 4250ea67..be768d71 100644 --- a/ncurses/llib-lncursesw +++ b/ncurses/llib-lncursesw @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2001-2010,2011 Free Software Foundation, Inc. * + * Copyright (c) 2001-2011,2013 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 +27,7 @@ ****************************************************************************/ /**************************************************************************** - * Author: Thomas E. Dickey 2001-2010,2011 * + * Author: Thomas E. Dickey 2001-on * ****************************************************************************/ /* LINTLIBRARY */ @@ -366,17 +366,17 @@ int pair_content( #undef _nc_do_color_sp void _nc_do_color_sp( SCREEN *sp, - short old_pair, - short pair, - NCURSES_BOOL reverse, + 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 old_pair, + int pair, + int reverse, NCURSES_OUTC outc) { /* void */ } @@ -454,86 +454,88 @@ int flash(void) /* ./lib_gen.c */ +#include + #undef addch -int addch( +int (addch)( const chtype z) { return(*(int *)0); } #undef addchnstr -int addchnstr( +int (addchnstr)( const chtype *a1, int z) { return(*(int *)0); } #undef addchstr -int addchstr( +int (addchstr)( const chtype *z) { return(*(int *)0); } #undef addnstr -int addnstr( +int (addnstr)( const char *a1, int z) { return(*(int *)0); } #undef addstr -int addstr( +int (addstr)( const char *z) { return(*(int *)0); } #undef attroff -int attroff( - NCURSES_ATTR_T z) +int (attroff)( + int z) { return(*(int *)0); } #undef attron -int attron( - NCURSES_ATTR_T z) +int (attron)( + int z) { return(*(int *)0); } #undef attrset -int attrset( - NCURSES_ATTR_T z) +int (attrset)( + int z) { return(*(int *)0); } #undef attr_get -int attr_get( +int (attr_get)( attr_t *a1, short *a2, void *z) { return(*(int *)0); } #undef attr_off -int attr_off( +int (attr_off)( attr_t a1, void *z) { return(*(int *)0); } #undef attr_on -int attr_on( +int (attr_on)( attr_t a1, void *z) { return(*(int *)0); } #undef attr_set -int attr_set( +int (attr_set)( attr_t a1, short a2, void *z) { return(*(int *)0); } #undef bkgd -int bkgd( +int (bkgd)( chtype z) { return(*(int *)0); } #undef bkgdset -void bkgdset( +void (bkgdset)( chtype z) { /* void */ } #undef border -int border( +int (border)( chtype a1, chtype a2, chtype a3, @@ -545,14 +547,14 @@ int border( { return(*(int *)0); } #undef box -int box( +int (box)( WINDOW *a1, chtype a2, chtype z) { return(*(int *)0); } #undef chgat -int chgat( +int (chgat)( int a1, attr_t a2, short a3, @@ -560,137 +562,137 @@ int chgat( { return(*(int *)0); } #undef clear -int clear(void) +int (clear)(void) { return(*(int *)0); } #undef clrtobot -int clrtobot(void) +int (clrtobot)(void) { return(*(int *)0); } #undef clrtoeol -int clrtoeol(void) +int (clrtoeol)(void) { return(*(int *)0); } #undef color_set -int color_set( +int (color_set)( short a1, void *z) { return(*(int *)0); } #undef COLOR_PAIR -int COLOR_PAIR( +int (COLOR_PAIR)( int z) { return(*(int *)0); } #undef delch -int delch(void) +int (delch)(void) { return(*(int *)0); } #undef deleteln -int deleteln(void) +int (deleteln)(void) { return(*(int *)0); } #undef echochar -int echochar( +int (echochar)( const chtype z) { return(*(int *)0); } #undef erase -int erase(void) +int (erase)(void) { return(*(int *)0); } #undef getbkgd -chtype getbkgd( +chtype (getbkgd)( WINDOW *z) { return(*(chtype *)0); } #undef getch -int getch(void) +int (getch)(void) { return(*(int *)0); } #undef getnstr -int getnstr( +int (getnstr)( char *a1, int z) { return(*(int *)0); } #undef getstr -int getstr( +int (getstr)( char *z) { return(*(int *)0); } #undef hline -int hline( +int (hline)( chtype a1, int z) { return(*(int *)0); } #undef inch -chtype inch(void) +chtype (inch)(void) { return(*(chtype *)0); } #undef inchnstr -int inchnstr( +int (inchnstr)( chtype *a1, int z) { return(*(int *)0); } #undef inchstr -int inchstr( +int (inchstr)( chtype *z) { return(*(int *)0); } #undef innstr -int innstr( +int (innstr)( char *a1, int z) { return(*(int *)0); } #undef insch -int insch( +int (insch)( chtype z) { return(*(int *)0); } #undef insdelln -int insdelln( +int (insdelln)( int z) { return(*(int *)0); } #undef insertln -int insertln(void) +int (insertln)(void) { return(*(int *)0); } #undef insnstr -int insnstr( +int (insnstr)( const char *a1, int z) { return(*(int *)0); } #undef insstr -int insstr( +int (insstr)( const char *z) { return(*(int *)0); } #undef instr -int instr( +int (instr)( char *z) { return(*(int *)0); } #undef move -int move( +int (move)( int a1, int z) { return(*(int *)0); } #undef mvaddch -int mvaddch( +int (mvaddch)( int a1, int a2, const chtype z) { return(*(int *)0); } #undef mvaddchnstr -int mvaddchnstr( +int (mvaddchnstr)( int a1, int a2, const chtype *a3, @@ -698,14 +700,14 @@ int mvaddchnstr( { return(*(int *)0); } #undef mvaddchstr -int mvaddchstr( +int (mvaddchstr)( int a1, int a2, const chtype *z) { return(*(int *)0); } #undef mvaddnstr -int mvaddnstr( +int (mvaddnstr)( int a1, int a2, const char *a3, @@ -713,14 +715,14 @@ int mvaddnstr( { return(*(int *)0); } #undef mvaddstr -int mvaddstr( +int (mvaddstr)( int a1, int a2, const char *z) { return(*(int *)0); } #undef mvchgat -int mvchgat( +int (mvchgat)( int a1, int a2, int a3, @@ -730,19 +732,19 @@ int mvchgat( { return(*(int *)0); } #undef mvdelch -int mvdelch( +int (mvdelch)( int a1, int z) { return(*(int *)0); } #undef mvgetch -int mvgetch( +int (mvgetch)( int a1, int z) { return(*(int *)0); } #undef mvgetnstr -int mvgetnstr( +int (mvgetnstr)( int a1, int a2, char *a3, @@ -750,14 +752,14 @@ int mvgetnstr( { return(*(int *)0); } #undef mvgetstr -int mvgetstr( +int (mvgetstr)( int a1, int a2, char *z) { return(*(int *)0); } #undef mvhline -int mvhline( +int (mvhline)( int a1, int a2, chtype a3, @@ -765,13 +767,13 @@ int mvhline( { return(*(int *)0); } #undef mvinch -chtype mvinch( +chtype (mvinch)( int a1, int z) { return(*(chtype *)0); } #undef mvinchnstr -int mvinchnstr( +int (mvinchnstr)( int a1, int a2, chtype *a3, @@ -779,14 +781,14 @@ int mvinchnstr( { return(*(int *)0); } #undef mvinchstr -int mvinchstr( +int (mvinchstr)( int a1, int a2, chtype *z) { return(*(int *)0); } #undef mvinnstr -int mvinnstr( +int (mvinnstr)( int a1, int a2, char *a3, @@ -794,14 +796,14 @@ int mvinnstr( { return(*(int *)0); } #undef mvinsch -int mvinsch( +int (mvinsch)( int a1, int a2, chtype z) { return(*(int *)0); } #undef mvinsnstr -int mvinsnstr( +int (mvinsnstr)( int a1, int a2, const char *a3, @@ -809,21 +811,21 @@ int mvinsnstr( { return(*(int *)0); } #undef mvinsstr -int mvinsstr( +int (mvinsstr)( int a1, int a2, const char *z) { return(*(int *)0); } #undef mvinstr -int mvinstr( +int (mvinstr)( int a1, int a2, char *z) { return(*(int *)0); } #undef mvvline -int mvvline( +int (mvvline)( int a1, int a2, chtype a3, @@ -831,7 +833,7 @@ int mvvline( { return(*(int *)0); } #undef mvwaddch -int mvwaddch( +int (mvwaddch)( WINDOW *a1, int a2, int a3, @@ -839,7 +841,7 @@ int mvwaddch( { return(*(int *)0); } #undef mvwaddchnstr -int mvwaddchnstr( +int (mvwaddchnstr)( WINDOW *a1, int a2, int a3, @@ -848,7 +850,7 @@ int mvwaddchnstr( { return(*(int *)0); } #undef mvwaddchstr -int mvwaddchstr( +int (mvwaddchstr)( WINDOW *a1, int a2, int a3, @@ -856,7 +858,7 @@ int mvwaddchstr( { return(*(int *)0); } #undef mvwaddnstr -int mvwaddnstr( +int (mvwaddnstr)( WINDOW *a1, int a2, int a3, @@ -865,7 +867,7 @@ int mvwaddnstr( { return(*(int *)0); } #undef mvwaddstr -int mvwaddstr( +int (mvwaddstr)( WINDOW *a1, int a2, int a3, @@ -873,7 +875,7 @@ int mvwaddstr( { return(*(int *)0); } #undef mvwchgat -int mvwchgat( +int (mvwchgat)( WINDOW *a1, int a2, int a3, @@ -884,21 +886,21 @@ int mvwchgat( { return(*(int *)0); } #undef mvwdelch -int mvwdelch( +int (mvwdelch)( WINDOW *a1, int a2, int z) { return(*(int *)0); } #undef mvwgetch -int mvwgetch( +int (mvwgetch)( WINDOW *a1, int a2, int z) { return(*(int *)0); } #undef mvwgetnstr -int mvwgetnstr( +int (mvwgetnstr)( WINDOW *a1, int a2, int a3, @@ -907,7 +909,7 @@ int mvwgetnstr( { return(*(int *)0); } #undef mvwgetstr -int mvwgetstr( +int (mvwgetstr)( WINDOW *a1, int a2, int a3, @@ -915,7 +917,7 @@ int mvwgetstr( { return(*(int *)0); } #undef mvwhline -int mvwhline( +int (mvwhline)( WINDOW *a1, int a2, int a3, @@ -924,14 +926,14 @@ int mvwhline( { return(*(int *)0); } #undef mvwinch -chtype mvwinch( +chtype (mvwinch)( WINDOW *a1, int a2, int z) { return(*(chtype *)0); } #undef mvwinchnstr -int mvwinchnstr( +int (mvwinchnstr)( WINDOW *a1, int a2, int a3, @@ -940,7 +942,7 @@ int mvwinchnstr( { return(*(int *)0); } #undef mvwinchstr -int mvwinchstr( +int (mvwinchstr)( WINDOW *a1, int a2, int a3, @@ -948,7 +950,7 @@ int mvwinchstr( { return(*(int *)0); } #undef mvwinnstr -int mvwinnstr( +int (mvwinnstr)( WINDOW *a1, int a2, int a3, @@ -957,7 +959,7 @@ int mvwinnstr( { return(*(int *)0); } #undef mvwinsch -int mvwinsch( +int (mvwinsch)( WINDOW *a1, int a2, int a3, @@ -965,7 +967,7 @@ int mvwinsch( { return(*(int *)0); } #undef mvwinsnstr -int mvwinsnstr( +int (mvwinsnstr)( WINDOW *a1, int a2, int a3, @@ -974,7 +976,7 @@ int mvwinsnstr( { return(*(int *)0); } #undef mvwinsstr -int mvwinsstr( +int (mvwinsstr)( WINDOW *a1, int a2, int a3, @@ -982,7 +984,7 @@ int mvwinsstr( { return(*(int *)0); } #undef mvwinstr -int mvwinstr( +int (mvwinstr)( WINDOW *a1, int a2, int a3, @@ -990,7 +992,7 @@ int mvwinstr( { return(*(int *)0); } #undef mvwvline -int mvwvline( +int (mvwvline)( WINDOW *a1, int a2, int a3, @@ -999,129 +1001,129 @@ int mvwvline( { return(*(int *)0); } #undef PAIR_NUMBER -int PAIR_NUMBER( +int (PAIR_NUMBER)( int z) { return(*(int *)0); } #undef redrawwin -int redrawwin( +int (redrawwin)( WINDOW *z) { return(*(int *)0); } #undef refresh -int refresh(void) +int (refresh)(void) { return(*(int *)0); } #undef scrl -int scrl( +int (scrl)( int z) { return(*(int *)0); } #undef scroll -int scroll( +int (scroll)( WINDOW *z) { return(*(int *)0); } #undef setscrreg -int setscrreg( +int (setscrreg)( int a1, int z) { return(*(int *)0); } #undef slk_attr_off -int slk_attr_off( +int (slk_attr_off)( const attr_t a1, void *z) { return(*(int *)0); } #undef slk_attr_on -int slk_attr_on( +int (slk_attr_on)( attr_t a1, void *z) { return(*(int *)0); } #undef standout -int standout(void) +int (standout)(void) { return(*(int *)0); } #undef standend -int standend(void) +int (standend)(void) { return(*(int *)0); } #undef timeout -void timeout( +void (timeout)( int z) { /* void */ } #undef touchline -int touchline( +int (touchline)( WINDOW *a1, int a2, int z) { return(*(int *)0); } #undef touchwin -int touchwin( +int (touchwin)( WINDOW *z) { return(*(int *)0); } #undef untouchwin -int untouchwin( +int (untouchwin)( WINDOW *z) { return(*(int *)0); } #undef vline -int vline( +int (vline)( chtype a1, int z) { return(*(int *)0); } #undef vw_printw -int vw_printw( +int (vw_printw)( WINDOW *a1, const char *a2, va_list z) { return(*(int *)0); } #undef vw_scanw -int vw_scanw( +int (vw_scanw)( WINDOW *a1, char *a2, va_list z) { return(*(int *)0); } #undef waddchstr -int waddchstr( +int (waddchstr)( WINDOW *a1, const chtype *z) { return(*(int *)0); } #undef waddstr -int waddstr( +int (waddstr)( WINDOW *a1, const char *z) { return(*(int *)0); } #undef wattron -int wattron( +int (wattron)( WINDOW *a1, int z) { return(*(int *)0); } #undef wattroff -int wattroff( +int (wattroff)( WINDOW *a1, int z) { return(*(int *)0); } #undef wattrset -int wattrset( +int (wattrset)( WINDOW *a1, int z) { return(*(int *)0); } #undef wattr_get -int wattr_get( +int (wattr_get)( WINDOW *a1, attr_t *a2, short *a3, @@ -1129,7 +1131,7 @@ int wattr_get( { return(*(int *)0); } #undef wattr_set -int wattr_set( +int (wattr_set)( WINDOW *a1, attr_t a2, short a3, @@ -1137,205 +1139,205 @@ int wattr_set( { return(*(int *)0); } #undef wdeleteln -int wdeleteln( +int (wdeleteln)( WINDOW *z) { return(*(int *)0); } #undef wgetstr -int wgetstr( +int (wgetstr)( WINDOW *a1, char *z) { return(*(int *)0); } #undef winchstr -int winchstr( +int (winchstr)( WINDOW *a1, chtype *z) { return(*(int *)0); } #undef winsertln -int winsertln( +int (winsertln)( WINDOW *z) { return(*(int *)0); } #undef winsstr -int winsstr( +int (winsstr)( WINDOW *a1, const char *z) { return(*(int *)0); } #undef winstr -int winstr( +int (winstr)( WINDOW *a1, char *z) { return(*(int *)0); } #undef wstandout -int wstandout( +int (wstandout)( WINDOW *z) { return(*(int *)0); } #undef wstandend -int wstandend( +int (wstandend)( WINDOW *z) { return(*(int *)0); } #undef getattrs -int getattrs( +int (getattrs)( const WINDOW *z) { return(*(int *)0); } #undef getcurx -int getcurx( +int (getcurx)( const WINDOW *z) { return(*(int *)0); } #undef getcury -int getcury( +int (getcury)( const WINDOW *z) { return(*(int *)0); } #undef getbegx -int getbegx( +int (getbegx)( const WINDOW *z) { return(*(int *)0); } #undef getbegy -int getbegy( +int (getbegy)( const WINDOW *z) { return(*(int *)0); } #undef getmaxx -int getmaxx( +int (getmaxx)( const WINDOW *z) { return(*(int *)0); } #undef getmaxy -int getmaxy( +int (getmaxy)( const WINDOW *z) { return(*(int *)0); } #undef getparx -int getparx( +int (getparx)( const WINDOW *z) { return(*(int *)0); } #undef getpary -int getpary( +int (getpary)( const WINDOW *z) { return(*(int *)0); } #undef wgetparent -WINDOW *wgetparent( +WINDOW *(wgetparent)( const WINDOW *z) { return(*(WINDOW **)0); } #undef is_cleared -NCURSES_BOOL is_cleared( +NCURSES_BOOL (is_cleared)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_idcok -NCURSES_BOOL is_idcok( +NCURSES_BOOL (is_idcok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_idlok -NCURSES_BOOL is_idlok( +NCURSES_BOOL (is_idlok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_immedok -NCURSES_BOOL is_immedok( +NCURSES_BOOL (is_immedok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_keypad -NCURSES_BOOL is_keypad( +NCURSES_BOOL (is_keypad)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_leaveok -NCURSES_BOOL is_leaveok( +NCURSES_BOOL (is_leaveok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_nodelay -NCURSES_BOOL is_nodelay( +NCURSES_BOOL (is_nodelay)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_notimeout -NCURSES_BOOL is_notimeout( +NCURSES_BOOL (is_notimeout)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_pad -NCURSES_BOOL is_pad( +NCURSES_BOOL (is_pad)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_scrollok -NCURSES_BOOL is_scrollok( +NCURSES_BOOL (is_scrollok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_subwin -NCURSES_BOOL is_subwin( +NCURSES_BOOL (is_subwin)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef is_syncok -NCURSES_BOOL is_syncok( +NCURSES_BOOL (is_syncok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } #undef wgetscrreg -int wgetscrreg( +int (wgetscrreg)( const WINDOW *a1, int *a2, int *z) { return(*(int *)0); } #undef add_wch -int add_wch( +int (add_wch)( const cchar_t *z) { return(*(int *)0); } #undef add_wchnstr -int add_wchnstr( +int (add_wchnstr)( const cchar_t *a1, int z) { return(*(int *)0); } #undef add_wchstr -int add_wchstr( +int (add_wchstr)( const cchar_t *z) { return(*(int *)0); } #undef addnwstr -int addnwstr( +int (addnwstr)( const wchar_t *a1, int z) { return(*(int *)0); } #undef addwstr -int addwstr( +int (addwstr)( const wchar_t *z) { return(*(int *)0); } #undef bkgrnd -int bkgrnd( +int (bkgrnd)( const cchar_t *z) { return(*(int *)0); } #undef bkgrndset -void bkgrndset( +void (bkgrndset)( const cchar_t *z) { /* void */ } #undef border_set -int border_set( +int (border_set)( const cchar_t *a1, const cchar_t *a2, const cchar_t *a3, @@ -1347,96 +1349,96 @@ int border_set( { return(*(int *)0); } #undef box_set -int box_set( +int (box_set)( WINDOW *a1, const cchar_t *a2, const cchar_t *z) { return(*(int *)0); } #undef echo_wchar -int echo_wchar( +int (echo_wchar)( const cchar_t *z) { return(*(int *)0); } #undef get_wch -int get_wch( +int (get_wch)( wint_t *z) { return(*(int *)0); } #undef get_wstr -int get_wstr( +int (get_wstr)( wint_t *z) { return(*(int *)0); } #undef getbkgrnd -int getbkgrnd( +int (getbkgrnd)( cchar_t *z) { return(*(int *)0); } #undef getn_wstr -int getn_wstr( +int (getn_wstr)( wint_t *a1, int z) { return(*(int *)0); } #undef hline_set -int hline_set( +int (hline_set)( const cchar_t *a1, int z) { return(*(int *)0); } #undef in_wch -int in_wch( +int (in_wch)( cchar_t *z) { return(*(int *)0); } #undef in_wchnstr -int in_wchnstr( +int (in_wchnstr)( cchar_t *a1, int z) { return(*(int *)0); } #undef in_wchstr -int in_wchstr( +int (in_wchstr)( cchar_t *z) { return(*(int *)0); } #undef innwstr -int innwstr( +int (innwstr)( wchar_t *a1, int z) { return(*(int *)0); } #undef ins_nwstr -int ins_nwstr( +int (ins_nwstr)( const wchar_t *a1, int z) { return(*(int *)0); } #undef ins_wch -int ins_wch( +int (ins_wch)( const cchar_t *z) { return(*(int *)0); } #undef ins_wstr -int ins_wstr( +int (ins_wstr)( const wchar_t *z) { return(*(int *)0); } #undef inwstr -int inwstr( +int (inwstr)( wchar_t *z) { return(*(int *)0); } #undef mvadd_wch -int mvadd_wch( +int (mvadd_wch)( int a1, int a2, const cchar_t *z) { return(*(int *)0); } #undef mvadd_wchnstr -int mvadd_wchnstr( +int (mvadd_wchnstr)( int a1, int a2, const cchar_t *a3, @@ -1444,14 +1446,14 @@ int mvadd_wchnstr( { return(*(int *)0); } #undef mvadd_wchstr -int mvadd_wchstr( +int (mvadd_wchstr)( int a1, int a2, const cchar_t *z) { return(*(int *)0); } #undef mvaddnwstr -int mvaddnwstr( +int (mvaddnwstr)( int a1, int a2, const wchar_t *a3, @@ -1459,28 +1461,28 @@ int mvaddnwstr( { return(*(int *)0); } #undef mvaddwstr -int mvaddwstr( +int (mvaddwstr)( int a1, int a2, const wchar_t *z) { return(*(int *)0); } #undef mvget_wch -int mvget_wch( +int (mvget_wch)( int a1, int a2, wint_t *z) { return(*(int *)0); } #undef mvget_wstr -int mvget_wstr( +int (mvget_wstr)( int a1, int a2, wint_t *z) { return(*(int *)0); } #undef mvgetn_wstr -int mvgetn_wstr( +int (mvgetn_wstr)( int a1, int a2, wint_t *a3, @@ -1488,7 +1490,7 @@ int mvgetn_wstr( { return(*(int *)0); } #undef mvhline_set -int mvhline_set( +int (mvhline_set)( int a1, int a2, const cchar_t *a3, @@ -1496,14 +1498,14 @@ int mvhline_set( { return(*(int *)0); } #undef mvin_wch -int mvin_wch( +int (mvin_wch)( int a1, int a2, cchar_t *z) { return(*(int *)0); } #undef mvin_wchnstr -int mvin_wchnstr( +int (mvin_wchnstr)( int a1, int a2, cchar_t *a3, @@ -1511,14 +1513,14 @@ int mvin_wchnstr( { return(*(int *)0); } #undef mvin_wchstr -int mvin_wchstr( +int (mvin_wchstr)( int a1, int a2, cchar_t *z) { return(*(int *)0); } #undef mvinnwstr -int mvinnwstr( +int (mvinnwstr)( int a1, int a2, wchar_t *a3, @@ -1526,7 +1528,7 @@ int mvinnwstr( { return(*(int *)0); } #undef mvins_nwstr -int mvins_nwstr( +int (mvins_nwstr)( int a1, int a2, const wchar_t *a3, @@ -1534,28 +1536,28 @@ int mvins_nwstr( { return(*(int *)0); } #undef mvins_wch -int mvins_wch( +int (mvins_wch)( int a1, int a2, const cchar_t *z) { return(*(int *)0); } #undef mvins_wstr -int mvins_wstr( +int (mvins_wstr)( int a1, int a2, const wchar_t *z) { return(*(int *)0); } #undef mvinwstr -int mvinwstr( +int (mvinwstr)( int a1, int a2, wchar_t *z) { return(*(int *)0); } #undef mvvline_set -int mvvline_set( +int (mvvline_set)( int a1, int a2, const cchar_t *a3, @@ -1563,7 +1565,7 @@ int mvvline_set( { return(*(int *)0); } #undef mvwadd_wch -int mvwadd_wch( +int (mvwadd_wch)( WINDOW *a1, int a2, int a3, @@ -1571,7 +1573,7 @@ int mvwadd_wch( { return(*(int *)0); } #undef mvwadd_wchnstr -int mvwadd_wchnstr( +int (mvwadd_wchnstr)( WINDOW *a1, int a2, int a3, @@ -1580,7 +1582,7 @@ int mvwadd_wchnstr( { return(*(int *)0); } #undef mvwadd_wchstr -int mvwadd_wchstr( +int (mvwadd_wchstr)( WINDOW *a1, int a2, int a3, @@ -1588,7 +1590,7 @@ int mvwadd_wchstr( { return(*(int *)0); } #undef mvwaddnwstr -int mvwaddnwstr( +int (mvwaddnwstr)( WINDOW *a1, int a2, int a3, @@ -1597,7 +1599,7 @@ int mvwaddnwstr( { return(*(int *)0); } #undef mvwaddwstr -int mvwaddwstr( +int (mvwaddwstr)( WINDOW *a1, int a2, int a3, @@ -1605,7 +1607,7 @@ int mvwaddwstr( { return(*(int *)0); } #undef mvwget_wch -int mvwget_wch( +int (mvwget_wch)( WINDOW *a1, int a2, int a3, @@ -1613,7 +1615,7 @@ int mvwget_wch( { return(*(int *)0); } #undef mvwget_wstr -int mvwget_wstr( +int (mvwget_wstr)( WINDOW *a1, int a2, int a3, @@ -1621,7 +1623,7 @@ int mvwget_wstr( { return(*(int *)0); } #undef mvwgetn_wstr -int mvwgetn_wstr( +int (mvwgetn_wstr)( WINDOW *a1, int a2, int a3, @@ -1630,7 +1632,7 @@ int mvwgetn_wstr( { return(*(int *)0); } #undef mvwhline_set -int mvwhline_set( +int (mvwhline_set)( WINDOW *a1, int a2, int a3, @@ -1639,7 +1641,7 @@ int mvwhline_set( { return(*(int *)0); } #undef mvwin_wch -int mvwin_wch( +int (mvwin_wch)( WINDOW *a1, int a2, int a3, @@ -1647,7 +1649,7 @@ int mvwin_wch( { return(*(int *)0); } #undef mvwin_wchnstr -int mvwin_wchnstr( +int (mvwin_wchnstr)( WINDOW *a1, int a2, int a3, @@ -1656,7 +1658,7 @@ int mvwin_wchnstr( { return(*(int *)0); } #undef mvwin_wchstr -int mvwin_wchstr( +int (mvwin_wchstr)( WINDOW *a1, int a2, int a3, @@ -1664,7 +1666,7 @@ int mvwin_wchstr( { return(*(int *)0); } #undef mvwinnwstr -int mvwinnwstr( +int (mvwinnwstr)( WINDOW *a1, int a2, int a3, @@ -1673,7 +1675,7 @@ int mvwinnwstr( { return(*(int *)0); } #undef mvwins_nwstr -int mvwins_nwstr( +int (mvwins_nwstr)( WINDOW *a1, int a2, int a3, @@ -1682,7 +1684,7 @@ int mvwins_nwstr( { return(*(int *)0); } #undef mvwins_wch -int mvwins_wch( +int (mvwins_wch)( WINDOW *a1, int a2, int a3, @@ -1690,7 +1692,7 @@ int mvwins_wch( { return(*(int *)0); } #undef mvwins_wstr -int mvwins_wstr( +int (mvwins_wstr)( WINDOW *a1, int a2, int a3, @@ -1698,7 +1700,7 @@ int mvwins_wstr( { return(*(int *)0); } #undef mvwinwstr -int mvwinwstr( +int (mvwinwstr)( WINDOW *a1, int a2, int a3, @@ -1706,7 +1708,7 @@ int mvwinwstr( { return(*(int *)0); } #undef mvwvline_set -int mvwvline_set( +int (mvwvline_set)( WINDOW *a1, int a2, int a3, @@ -1715,49 +1717,49 @@ int mvwvline_set( { return(*(int *)0); } #undef vline_set -int vline_set( +int (vline_set)( const cchar_t *a1, int z) { return(*(int *)0); } #undef wadd_wchstr -int wadd_wchstr( +int (wadd_wchstr)( WINDOW *a1, const cchar_t *z) { return(*(int *)0); } #undef waddwstr -int waddwstr( +int (waddwstr)( WINDOW *a1, const wchar_t *z) { return(*(int *)0); } #undef wget_wstr -int wget_wstr( +int (wget_wstr)( WINDOW *a1, wint_t *z) { return(*(int *)0); } #undef wgetbkgrnd -int wgetbkgrnd( +int (wgetbkgrnd)( WINDOW *a1, cchar_t *z) { return(*(int *)0); } #undef win_wchstr -int win_wchstr( +int (win_wchstr)( WINDOW *a1, cchar_t *z) { return(*(int *)0); } #undef wins_wstr -int wins_wstr( +int (wins_wstr)( WINDOW *a1, const wchar_t *z) { return(*(int *)0); } #undef mouse_trafo -NCURSES_BOOL mouse_trafo( +NCURSES_BOOL (mouse_trafo)( int *a1, int *a2, NCURSES_BOOL z) @@ -2031,6 +2033,23 @@ void _nc_mvcur_wrap_sp( 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, @@ -2097,6 +2116,8 @@ SCREEN *newterm( /* ./base/lib_newwin.c */ +#include "/usr/lib/gcc/x86_64-linux-gnu/4.4.5/include/stddef.h" + #undef _nc_freewin int _nc_freewin( WINDOW *win) @@ -2440,8 +2461,8 @@ int scr_set( void _nc_scroll_window( WINDOW *win, int const n, - short const top, - short const bottom, + int const top, + int const bottom, cchar_t blank) { /* void */ } @@ -2486,7 +2507,7 @@ int _nc_setupscreen_sp( int slines, int scolumns, FILE *output, - NCURSES_BOOL filtered, + int filtered, int slk_format) { return(*(int *)0); } @@ -2495,7 +2516,7 @@ int _nc_setupscreen( int slines, int scolumns, FILE *output, - NCURSES_BOOL filtered, + int filtered, int slk_format) { return(*(int *)0); } @@ -2777,7 +2798,7 @@ char *_tracemouse( #undef _nc_signal_handler void _nc_signal_handler( - NCURSES_BOOL enable) + int enable) { /* void */ } /* ./base/lib_ungetch.c */ @@ -3014,12 +3035,6 @@ char *_nc_varargs( va_list ap) { return(*(char **)0); } -/* ./base/memmove.c */ - -#undef _nc_memmove -void _nc_memmove(void) - { /* void */ } - /* ./base/vsscanf.c */ #undef _nc_vsscanf @@ -3554,7 +3569,7 @@ void _nc_align_termtype( #undef _nc_copy_termtype void _nc_copy_termtype( TERMTYPE *dst, - TERMTYPE *src) + const TERMTYPE *src) { /* void */ } /* ./codes.c */ @@ -3653,6 +3668,8 @@ struct name_table_entry const *_nc_find_type_entry( /* ./tinfo/db_iterator.c */ +#include + #undef _nc_tic_dir const char *_nc_tic_dir( const char *path) @@ -3744,6 +3761,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 @@ -3929,8 +3952,6 @@ char *longname(void) /* ./tinfo/lib_napms.c */ -#include - #undef napms_sp int napms_sp( SCREEN *sp, @@ -4040,7 +4061,7 @@ int _nc_putp_flush_sp( #undef _nc_keypad int _nc_keypad( SCREEN *sp, - NCURSES_BOOL flag) + int flag) { return(*(int *)0); } /* ./tinfo/lib_raw.c */ @@ -4149,17 +4170,17 @@ void use_env_sp( NCURSES_BOOL f) { /* void */ } -#undef use_env -void use_env( - 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) @@ -4186,7 +4207,7 @@ int _nc_setup_tinfo( #undef _nc_tinfo_cmdch void _nc_tinfo_cmdch( TERMINAL *termp, - char proto) + int proto) { /* void */ } #undef _nc_get_locale @@ -4207,7 +4228,7 @@ int _nc_setupterm( char *tname, int Filedes, int *errret, - NCURSES_BOOL reuse) + int reuse) { return(*(int *)0); } #undef new_prescr @@ -4346,7 +4367,7 @@ int _nc_tparm_err; int _nc_tparm_analyze( const char *string, char *p_is_s[9], - int *popcount) + int *_nc_popcount) { return(*(int *)0); } #undef tparm @@ -4366,7 +4387,7 @@ char *tiparm( #undef PC char PC; #undef ospeed -NCURSES_OSPEED ospeed; +short ospeed; #undef _nc_nulls_sent int _nc_nulls_sent; @@ -4406,12 +4427,28 @@ 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, @@ -4419,11 +4456,6 @@ int _nc_putp_sp( const char *string) { return(*(int *)0); } -#undef putp -int putp( - const char *string) - { return(*(int *)0); } - #undef _nc_putp int _nc_putp( const char *name, @@ -4474,12 +4506,12 @@ void _tracef( #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( - char code) + int code) { return(*(char *)0); } #undef _nc_retrace_int @@ -4724,10 +4756,30 @@ char *const strnames[] = {0}; #undef strfnames 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 +#undef _nc_init_termtype +void _nc_init_termtype( + TERMTYPE *const tp) + { /* void */ } + #undef _nc_read_termtype int _nc_read_termtype( TERMTYPE *ptr, @@ -4752,25 +4804,8 @@ int _nc_read_entry( #include -#undef _nc_read_termcap_entry -int _nc_read_termcap_entry( - const char *const tn, - TERMTYPE *const tp) - { return(*(int *)0); } - -/* ./tinfo/setbuf.c */ - -#undef _nc_set_buffer_sp -void _nc_set_buffer_sp( - SCREEN *sp, - FILE *ofp, - NCURSES_BOOL buffered) - { /* void */ } - -#undef _nc_set_buffer -void _nc_set_buffer( - FILE *ofp, - NCURSES_BOOL buffered) +#undef _nc_read_termcap +void _nc_read_termcap(void) { /* void */ } /* ./tinfo/strings.c */ @@ -5018,6 +5053,8 @@ int _nc_resolve_uses( #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 diff --git a/ncurses/llib-ltict b/ncurses/llib-ltict new file mode 100644 index 00000000..8371c182 --- /dev/null +++ b/ncurses/llib-ltict @@ -0,0 +1,212 @@ +/**************************************************************************** + * Copyright (c) 2013 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 * + * "Software"), to deal in the Software without restriction, including * + * without limitation the rights to use, copy, modify, merge, publish, * + * distribute, distribute with modifications, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included * + * in all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + * * + * Except as contained in this notice, the name(s) of the above copyright * + * holders shall not be used in advertising or otherwise to promote the * + * sale, use or other dealings in this Software without prior written * + * authorization. * + ****************************************************************************/ + +/**************************************************************************** + * Author: Thomas E. Dickey 2013 * + ****************************************************************************/ +/* LINTLIBRARY */ + +/* ./tinfo/alloc_entry.c */ + +#include +#include + +#undef _nc_init_entry +void _nc_init_entry( + TERMTYPE *const tp) + { /* void */ } + +#undef _nc_copy_entry +ENTRY *_nc_copy_entry( + ENTRY *oldp) + { return(*(ENTRY **)0); } + +#undef _nc_save_str +char *_nc_save_str( + const char *const string) + { return(*(char **)0); } + +#undef _nc_wrap_entry +void _nc_wrap_entry( + ENTRY *const ep, + NCURSES_BOOL copy_strings) + { /* void */ } + +#undef _nc_merge_entry +void _nc_merge_entry( + TERMTYPE *const to, + TERMTYPE *const from) + { /* void */ } + +/* ./tinfo/captoinfo.c */ + +#include + +#undef _nc_captoinfo +char *_nc_captoinfo( + const char *cap, + const char *s, + int const parameterized) + { return(*(char **)0); } + +#undef _nc_infotocap +char *_nc_infotocap( + const char *cap, + const char *str, + int const parameterized) + { return(*(char **)0); } + +/* ./tinfo/comp_expand.c */ + +#undef _nc_tic_expand +char *_nc_tic_expand( + const char *srcp, + NCURSES_BOOL tic_format, + int numbers) + { return(*(char **)0); } + +/* ./tinfo/comp_parse.c */ + +#undef _nc_check_termtype2 +void (*_nc_check_termtype2)( + 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 *n2) + { return(*(NCURSES_BOOL *)0); } + +#undef _nc_read_entry_source +void _nc_read_entry_source( + 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 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 +long _nc_comment_start; +#undef _nc_comment_end +long _nc_comment_end; +#undef _nc_start_line +long _nc_start_line; +#undef _nc_curr_token +struct token _nc_curr_token; +#undef _nc_disable_period +NCURSES_BOOL _nc_disable_period; + +#undef _nc_reset_input +void _nc_reset_input( + FILE *fp, + char *buf) + { /* void */ } + +#undef _nc_get_token +int _nc_get_token( + NCURSES_BOOL silent) + { return(*(int *)0); } + +#undef _nc_trans_string +int _nc_trans_string( + char *ptr, + char *last) + { return(*(int *)0); } + +#undef _nc_push_token +void _nc_push_token( + int tokclass) + { /* void */ } + +#undef _nc_panic_mode +void _nc_panic_mode( + char ch) + { /* void */ } + +/* ./tinfo/parse_entry.c */ + +#undef _nc_parse_entry +int _nc_parse_entry( + struct entry *entryp, + int literal, + NCURSES_BOOL silent) + { return(*(int *)0); } + +#undef _nc_capcmp +int _nc_capcmp( + const char *s, + const char *t) + { return(*(int *)0); } + +typedef struct { + const char *from; + const char *to; +} assoc; + +/* ./tinfo/write_entry.c */ + +#include + +#undef _nc_set_writedir +void _nc_set_writedir( + char *dir) + { /* void */ } + +#undef _nc_write_entry +void _nc_write_entry( + TERMTYPE *const tp) + { /* void */ } + +#undef _nc_tic_written +int _nc_tic_written(void) + { return(*(int *)0); } diff --git a/ncurses/llib-ltinfo b/ncurses/llib-ltinfo index 10183a15..79ac2293 100644 --- a/ncurses/llib-ltinfo +++ b/ncurses/llib-ltinfo @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2012 Free Software Foundation, Inc. * + * Copyright (c) 2012,2013 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 * @@ -289,6 +289,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 @@ -694,17 +700,17 @@ void use_env_sp( NCURSES_BOOL f) { /* void */ } -#undef use_env -void use_env( - 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) @@ -891,7 +897,7 @@ int _nc_tparm_err; int _nc_tparm_analyze( const char *string, char *p_is_s[9], - int *popcount) + int *_nc_popcount) { return(*(int *)0); } #undef tparm @@ -951,12 +957,28 @@ 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, @@ -964,11 +986,6 @@ int _nc_putp_sp( const char *string) { return(*(int *)0); } -#undef putp -int putp( - const char *string) - { return(*(int *)0); } - #undef _nc_putp int _nc_putp( const char *name, @@ -1258,10 +1275,30 @@ char *const strnames[] = {0}; #undef strfnames 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 +#undef _nc_init_termtype +void _nc_init_termtype( + TERMTYPE *const tp) + { /* void */ } + #undef _nc_read_termtype int _nc_read_termtype( TERMTYPE *ptr, @@ -1290,21 +1327,6 @@ int _nc_read_entry( void _nc_read_termcap(void) { /* void */ } -/* ./tinfo/setbuf.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/strings.c */ #undef _nc_str_init diff --git a/ncurses/llib-ltinfot b/ncurses/llib-ltinfot new file mode 100644 index 00000000..4f66f6a0 --- /dev/null +++ b/ncurses/llib-ltinfot @@ -0,0 +1,1635 @@ +/**************************************************************************** + * Copyright (c) 2013 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 * + * "Software"), to deal in the Software without restriction, including * + * without limitation the rights to use, copy, modify, merge, publish, * + * distribute, distribute with modifications, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included * + * in all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + * * + * Except as contained in this notice, the name(s) of the above copyright * + * holders shall not be used in advertising or otherwise to promote the * + * sale, use or other dealings in this Software without prior written * + * authorization. * + ****************************************************************************/ + +/**************************************************************************** + * Author: Thomas E. Dickey 2013 * + ****************************************************************************/ +/* LINTLIBRARY */ + +/* ./tinfo/access.c */ + +#include +#include +#include + +#undef _nc_rootname +char *_nc_rootname( + char *path) + { return(*(char **)0); } + +#undef _nc_is_abs_path +NCURSES_BOOL _nc_is_abs_path( + const char *path) + { return(*(NCURSES_BOOL *)0); } + +#undef _nc_pathlast +unsigned _nc_pathlast( + const char *path) + { return(*(unsigned *)0); } + +#undef _nc_basename +char *_nc_basename( + char *path) + { return(*(char **)0); } + +#undef _nc_access +int _nc_access( + const char *path, + int mode) + { return(*(int *)0); } + +#undef _nc_is_dir_path +NCURSES_BOOL _nc_is_dir_path( + const char *path) + { return(*(NCURSES_BOOL *)0); } + +#undef _nc_is_file_path +NCURSES_BOOL _nc_is_file_path( + const char *path) + { return(*(NCURSES_BOOL *)0); } + +#undef _nc_env_access +int _nc_env_access(void) + { return(*(int *)0); } + +/* ./tinfo/add_tries.c */ + +#undef _nc_add_to_try +int _nc_add_to_try( + TRIES **tree, + const char *str, + unsigned code) + { return(*(int *)0); } + +/* ./tinfo/alloc_ttype.c */ + +#undef _nc_align_termtype +void _nc_align_termtype( + TERMTYPE *to, + TERMTYPE *from) + { /* void */ } + +#undef _nc_copy_termtype +void _nc_copy_termtype( + TERMTYPE *dst, + const TERMTYPE *src) + { /* void */ } + +/* ./codes.c */ + +#undef _nc_boolcodes +char *const *_nc_boolcodes(void) + { return(*(char **)0); } + +#undef _nc_numcodes +char *const *_nc_numcodes(void) + { return(*(char **)0); } + +#undef _nc_strcodes +char *const *_nc_strcodes(void) + { return(*(char **)0); } + +/* ./comp_captab.c */ + +#include + +#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 +int _nc_curr_line; +#undef _nc_curr_col +int _nc_curr_col; + +#undef _nc_get_source +const char *_nc_get_source(void) + { return(*(const char **)0); } + +#undef _nc_set_source +void _nc_set_source( + const char *const name) + { /* void */ } + +#undef _nc_set_type +void _nc_set_type( + const char *const name) + { /* void */ } + +#undef _nc_get_type +void _nc_get_type( + char *name) + { /* void */ } + +#undef _nc_warning +void _nc_warning( + const char *const fmt, + ...) + { /* void */ } + +#undef _nc_err_abort +void _nc_err_abort( + const char *const fmt, + ...) + { /* void */ } + +#undef _nc_syserr_abort +void _nc_syserr_abort( + 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); } + +/* ./tinfo/db_iterator.c */ + +#include + +#undef _nc_tic_dir +const char *_nc_tic_dir( + const char *path) + { return(*(const char **)0); } + +#undef _nc_keep_tic_dir +void _nc_keep_tic_dir( + const char *path) + { /* void */ } + +#undef _nc_last_db +void _nc_last_db(void) + { /* void */ } + +#undef _nc_next_db +const char *_nc_next_db( + DBDIRS *state, + int *offset) + { return(*(const char **)0); } + +#undef _nc_first_db +void _nc_first_db( + DBDIRS *state, + int *offset) + { /* void */ } + +/* ./tinfo/doalloc.c */ + +#undef _nc_doalloc +void *_nc_doalloc( + void *oldp, + size_t amount) + { return(*(void **)0); } + +/* ./tinfo/entries.c */ + +#undef _nc_head +ENTRY *_nc_head; +#undef _nc_tail +ENTRY *_nc_tail; + +#undef _nc_free_entry +void _nc_free_entry( + ENTRY *headp, + TERMTYPE *tterm) + { /* void */ } + +#undef _nc_free_entries +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 */ } + +/* ./fallback.c */ + +#undef _nc_fallback +const TERMTYPE *_nc_fallback( + const char *name) + { return(*(const TERMTYPE **)0); } + +/* ./tinfo/free_ttype.c */ + +#undef _nc_free_termtype +void _nc_free_termtype( + TERMTYPE *ptr) + { /* void */ } + +#undef _nc_user_definable +NCURSES_BOOL _nc_user_definable; + +#undef use_extended_names +int use_extended_names( + NCURSES_BOOL flag) + { return(*(int *)0); } + +/* ./tinfo/getenv_num.c */ + +#undef _nc_getenv_num +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 +char *_nc_home_terminfo(void) + { return(*(char **)0); } + +/* ./tinfo/init_keytry.c */ + +#if 0 + +#include + +#undef _nc_tinfo_fkeys +const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0}; + +#endif + +#undef _nc_init_keytry +void _nc_init_keytry( + SCREEN *sp) + { /* void */ } + +/* ./tinfo/lib_acs.c */ + +#undef _nc_acs_map +chtype *_nc_acs_map(void) + { return(*(chtype **)0); } + +#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 + +struct speed { + int s; + int sp; +}; + +#undef _nc_baudrate +int _nc_baudrate( + int OSpeed) + { return(*(int *)0); } + +#undef _nc_ospeed +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); } + +/* ./tinfo/lib_cur_term.c */ + +#undef _nc_get_cur_term_sp +TERMINAL *_nc_get_cur_term_sp( + SCREEN *sp) + { return(*(TERMINAL **)0); } + +#undef _nc_get_cur_term +TERMINAL *_nc_get_cur_term(void) + { return(*(TERMINAL **)0); } + +#undef _nc_cur_term +TERMINAL *_nc_cur_term(void) + { return(*(TERMINAL **)0); } + +#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) + { return(*(int *)0); } + +/* ./tinfo/lib_data.c */ + +#undef _nc_stdscr +WINDOW *_nc_stdscr(void) + { return(*(WINDOW **)0); } + +#undef _nc_curscr +WINDOW *_nc_curscr(void) + { return(*(WINDOW **)0); } + +#undef _nc_newscr +WINDOW *_nc_newscr(void) + { return(*(WINDOW **)0); } + +#undef _nc_screen_chain +SCREEN *_nc_screen_chain; +#undef SP +SCREEN *SP; +#undef _nc_globals +NCURSES_GLOBALS _nc_globals; +#undef _nc_prescreen +NCURSES_PRESCREEN _nc_prescreen; + +#undef _nc_screen_of +SCREEN *_nc_screen_of( + WINDOW *win) + { return(*(SCREEN **)0); } + +#undef _nc_init_pthreads +void _nc_init_pthreads(void) + { /* void */ } + +#undef _nc_mutex_init +void _nc_mutex_init( + pthread_mutex_t *obj) + { /* void */ } + +#undef _nc_mutex_lock +int _nc_mutex_lock( + pthread_mutex_t *obj) + { return(*(int *)0); } + +#undef _nc_mutex_trylock +int _nc_mutex_trylock( + pthread_mutex_t *obj) + { return(*(int *)0); } + +#undef _nc_mutex_unlock +int _nc_mutex_unlock( + pthread_mutex_t *obj) + { return(*(int *)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); } + +/* ./lib_keyname.c */ + +struct kn { short offset; int code; }; + +#undef keyname_sp +char *keyname_sp( + SCREEN *sp, + int c) + { return(*(char **)0); } + +#undef keyname +char *keyname( + int c) + { return(*(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 */ + +#undef napms_sp +int napms_sp( + SCREEN *sp, + int ms) + { return(*(int *)0); } + +#undef napms +int napms( + int ms) + { return(*(int *)0); } + +/* ./tinfo/lib_options.c */ + +#undef idlok +int idlok( + WINDOW *win, + NCURSES_BOOL flag) + { return(*(int *)0); } + +#undef idcok +void idcok( + 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) + { return(*(int *)0); } + +#undef nodelay +int nodelay( + WINDOW *win, + NCURSES_BOOL flag) + { return(*(int *)0); } + +#undef notimeout +int notimeout( + WINDOW *win, + NCURSES_BOOL f) + { return(*(int *)0); } + +#undef wtimeout +void wtimeout( + WINDOW *win, + int delay) + { /* void */ } + +#undef keypad +int keypad( + WINDOW *win, + NCURSES_BOOL flag) + { return(*(int *)0); } + +#undef meta +int meta( + 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( + 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, + NCURSES_BOOL flag) + { return(*(int *)0); } + +/* ./tinfo/lib_setup.c */ + +#include +#include +#include + +#undef _nc_ttytype +char *_nc_ttytype(void) + { return(*(char **)0); } + +#undef _nc_ptr_Lines +int *_nc_ptr_Lines( + SCREEN *sp) + { return(*(int **)0); } + +#undef _nc_LINES +int _nc_LINES(void) + { return(*(int *)0); } + +#undef _nc_ptr_Cols +int *_nc_ptr_Cols( + SCREEN *sp) + { return(*(int **)0); } + +#undef _nc_COLS +int _nc_COLS(void) + { return(*(int *)0); } + +#undef _nc_ptr_Tabsize +int *_nc_ptr_Tabsize( + SCREEN *sp) + { return(*(int **)0); } + +#undef _nc_TABSIZE +int _nc_TABSIZE(void) + { return(*(int *)0); } + +#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( + 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( + SCREEN *sp, + int *linep, + int *colp) + { /* void */ } + +#undef _nc_update_screensize +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 +char *_nc_get_locale(void) + { return(*(char **)0); } + +#undef _nc_unicode_locale +int _nc_unicode_locale(void) + { return(*(int *)0); } + +#undef _nc_locale_breaks_acs +int _nc_locale_breaks_acs( + TERMINAL *termp) + { return(*(int *)0); } + +#undef _nc_setupterm +int _nc_setupterm( + 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, + int *errret) + { return(*(int *)0); } + +/* ./tinfo/lib_termcap.c */ + +#undef UP +char *UP; +#undef BC +char *BC; + +#undef tgetent_sp +int tgetent_sp( + SCREEN *sp, + char *bufp, + const char *name) + { return(*(int *)0); } + +#if 0 + +#include + +#endif + +#undef tgetent +int tgetent( + char *bufp, + const char *name) + { return(*(int *)0); } + +#undef tgetflag_sp +int tgetflag_sp( + SCREEN *sp, + char *id) + { return(*(int *)0); } + +#undef tgetflag +int tgetflag( + char *id) + { return(*(int *)0); } + +#undef tgetnum_sp +int tgetnum_sp( + SCREEN *sp, + char *id) + { return(*(int *)0); } + +#undef tgetnum +int tgetnum( + char *id) + { return(*(int *)0); } + +#undef tgetstr_sp +char *tgetstr_sp( + SCREEN *sp, + char *id, + char **area) + { return(*(char **)0); } + +#undef tgetstr +char *tgetstr( + 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); } + +/* ./tinfo/lib_tgoto.c */ + +#undef tgoto +char *tgoto( + const char *string, + int x, + int y) + { return(*(char **)0); } + +/* ./tinfo/lib_ti.c */ + +#undef tigetflag_sp +int tigetflag_sp( + SCREEN *sp, + char *str) + { return(*(int *)0); } + +#undef tigetflag +int tigetflag( + char *str) + { return(*(int *)0); } + +#undef tigetnum_sp +int tigetnum_sp( + SCREEN *sp, + char *str) + { return(*(int *)0); } + +#undef tigetnum +int tigetnum( + char *str) + { return(*(int *)0); } + +#undef tigetstr_sp +char *tigetstr_sp( + SCREEN *sp, + char *str) + { return(*(char **)0); } + +#undef tigetstr +char *tigetstr( + char *str) + { return(*(char **)0); } + +/* ./tinfo/lib_tparm.c */ + +#undef _nc_tparm_err +int _nc_tparm_err; + +#undef _nc_tparm_analyze +int _nc_tparm_analyze( + const char *string, + char *p_is_s[9], + int *_nc_popcount) + { return(*(int *)0); } + +#undef tparm +char *tparm( + char *string, + ...) + { return(*(char **)0); } + +#undef tiparm +char *tiparm( + const char *string, + ...) + { return(*(char **)0); } + +/* ./tinfo/lib_tputs.c */ + +#undef PC +char PC; +#undef 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, + int (*outc)( + int p1)) + { return(*(int *)0); } + +/* ./trace/lib_trace.c */ + +#undef _nc_tracing +unsigned _nc_tracing; + +#undef _nc__nc_tputs_trace +const char *_nc__nc_tputs_trace(void) + { return(*(const char **)0); } + +#undef _nc__nc_outchars +long _nc__nc_outchars(void) + { return(*(long *)0); } + +#undef _nc_set_tputs_trace +void _nc_set_tputs_trace( + const char *s) + { /* void */ } + +#undef _nc_count_outchars +void _nc_count_outchars( + long increment) + { /* void */ } + +#undef trace +void trace( + const unsigned int tracelevel) + { /* void */ } + +#undef _tracef +void _tracef( + const char *fmt, + ...) + { /* void */ } + +#undef _nc_retrace_bool +NCURSES_BOOL _nc_retrace_bool( + 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) + { return(*(int *)0); } + +#undef _nc_retrace_unsigned +unsigned _nc_retrace_unsigned( + unsigned code) + { return(*(unsigned *)0); } + +#undef _nc_retrace_ptr +char *_nc_retrace_ptr( + char *code) + { return(*(char **)0); } + +#undef _nc_retrace_cptr +const char *_nc_retrace_cptr( + const char *code) + { return(*(const char **)0); } + +#undef _nc_retrace_cvoid_ptr +void *_nc_retrace_cvoid_ptr( + void *code) + { return(*(void **)0); } + +#undef _nc_retrace_void_ptr +void *_nc_retrace_void_ptr( + void *code) + { return(*(void **)0); } + +#undef _nc_retrace_sp +SCREEN *_nc_retrace_sp( + SCREEN *code) + { return(*(SCREEN **)0); } + +#undef _nc_retrace_win +WINDOW *_nc_retrace_win( + WINDOW *code) + { return(*(WINDOW **)0); } + +#undef _nc_use_tracef +int _nc_use_tracef( + unsigned mask) + { return(*(int *)0); } + +#undef _nc_locked_tracef +void _nc_locked_tracef( + const char *fmt, + ...) + { /* void */ } + +/* ./trace/lib_traceatr.c */ + +#undef _traceattr2 +char *_traceattr2( + int bufnum, + chtype newmode) + { return(*(char **)0); } + +#undef _traceattr +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) + { return(*(attr_t *)0); } + +#undef _nc_altcharset_name +const char *_nc_altcharset_name( + attr_t attr, + chtype ch) + { return(*(const char **)0); } + +#undef _tracechtype2 +char *_tracechtype2( + int bufnum, + chtype ch) + { return(*(char **)0); } + +#undef _tracechtype +char *_tracechtype( + chtype ch) + { return(*(char **)0); } + +#undef _nc_retrace_chtype +chtype _nc_retrace_chtype( + chtype code) + { return(*(chtype *)0); } + +/* ./trace/lib_tracebits.c */ + +typedef struct { + unsigned int val; + const char *name; +} BITNAMES; + +#undef _nc_trace_ttymode +char *_nc_trace_ttymode( + struct termios *tty) + { return(*(char **)0); } + +#undef _nc_tracebits +char *_nc_tracebits(void) + { return(*(char **)0); } + +/* ./trace/lib_tracechr.c */ + +#undef _nc_tracechar +char *_nc_tracechar( + SCREEN *sp, + int ch) + { return(*(char **)0); } + +#undef _tracechar +char *_tracechar( + int ch) + { return(*(char **)0); } + +/* ./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); } + +/* ./tty/lib_twait.c */ + +#include + +#undef _nc_timed_wait +int _nc_timed_wait( + SCREEN *sp, + int mode, + int milliseconds, + int *timeleft) + { return(*(int *)0); } + +/* ./tinfo/name_match.c */ + +#undef _nc_first_name +char *_nc_first_name( + const char *const sp) + { return(*(char **)0); } + +#undef _nc_name_match +int _nc_name_match( + const char *const namelst, + const char *const name, + const char *const delim) + { return(*(int *)0); } + +/* ./names.c */ + +#undef _nc_boolnames +char *const *_nc_boolnames(void) + { return(*(char **)0); } + +#undef _nc_boolfnames +char *const *_nc_boolfnames(void) + { return(*(char **)0); } + +#undef _nc_numnames +char *const *_nc_numnames(void) + { return(*(char **)0); } + +#undef _nc_numfnames +char *const *_nc_numfnames(void) + { return(*(char **)0); } + +#undef _nc_strnames +char *const *_nc_strnames(void) + { return(*(char **)0); } + +#undef _nc_strfnames +char *const *_nc_strfnames(void) + { return(*(char **)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 + +#undef _nc_init_termtype +void _nc_init_termtype( + TERMTYPE *const tp) + { /* void */ } + +#undef _nc_read_termtype +int _nc_read_termtype( + TERMTYPE *ptr, + char *buffer, + int limit) + { return(*(int *)0); } + +#undef _nc_read_file_entry +int _nc_read_file_entry( + const char *const filename, + TERMTYPE *ptr) + { return(*(int *)0); } + +#undef _nc_read_entry +int _nc_read_entry( + const char *const name, + char *const filename, + TERMTYPE *const tp) + { return(*(int *)0); } + +/* ./tinfo/read_termcap.c */ + +#include + +#undef _nc_read_termcap +void _nc_read_termcap(void) + { /* void */ } + +/* ./tinfo/strings.c */ + +#undef _nc_str_init +string_desc *_nc_str_init( + string_desc *dst, + char *src, + size_t len) + { return(*(string_desc **)0); } + +#undef _nc_str_null +string_desc *_nc_str_null( + string_desc *dst, + size_t len) + { return(*(string_desc **)0); } + +#undef _nc_str_copy +string_desc *_nc_str_copy( + string_desc *dst, + string_desc *src) + { return(*(string_desc **)0); } + +#undef _nc_safe_strcat +NCURSES_BOOL _nc_safe_strcat( + string_desc *dst, + const char *src) + { return(*(NCURSES_BOOL *)0); } + +#undef _nc_safe_strcpy +NCURSES_BOOL _nc_safe_strcpy( + string_desc *dst, + const char *src) + { return(*(NCURSES_BOOL *)0); } + +/* ./trace/trace_buf.c */ + +#undef _nc_trace_buf +char *_nc_trace_buf( + int bufnum, + size_t want) + { return(*(char **)0); } + +#undef _nc_trace_bufcat +char *_nc_trace_bufcat( + int bufnum, + const char *value) + { return(*(char **)0); } + +/* ./trace/trace_tries.c */ + +#undef _nc_trace_tries +void _nc_trace_tries( + TRIES *tree) + { /* void */ } + +/* ./base/tries.c */ + +#undef _nc_expand_try +char *_nc_expand_try( + TRIES *tree, + unsigned code, + int *count, + size_t len) + { return(*(char **)0); } + +#undef _nc_remove_key +int _nc_remove_key( + TRIES **tree, + unsigned code) + { return(*(int *)0); } + +#undef _nc_remove_string +int _nc_remove_string( + TRIES **tree, + const char *string) + { return(*(int *)0); } + +/* ./tinfo/trim_sgr0.c */ + +#undef _nc_trim_sgr0 +char *_nc_trim_sgr0( + TERMTYPE *tp) + { return(*(char **)0); } + +/* ./unctrl.c */ + +#undef unctrl_sp +char *unctrl_sp( + SCREEN *sp, + chtype ch) + { return(*(char **)0); } + +#undef unctrl +char *unctrl( + chtype ch) + { return(*(char **)0); } + +/* ./trace/visbuf.c */ + +#undef _nc_visbuf2 +const char *_nc_visbuf2( + int bufnum, + const char *buf) + { return(*(const char **)0); } + +#undef _nc_visbuf +const char *_nc_visbuf( + const char *buf) + { return(*(const char **)0); } + +#undef _nc_visbufn +const char *_nc_visbufn( + const char *buf, + int len) + { return(*(const char **)0); } + +#undef _nc_viscbuf2 +const char *_nc_viscbuf2( + int bufnum, + const chtype *buf, + int len) + { return(*(const char **)0); } + +#undef _nc_viscbuf +const char *_nc_viscbuf( + const chtype *buf, + int len) + { return(*(const char **)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, + int keycode) + { return(*(int *)0); } + +/* ./tinfo/hashed_db.c */ + +#undef _nc_hashed_db +void _nc_hashed_db(void) + { /* 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) + { return(*(int *)0); } + +/* ./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 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, + NCURSES_BOOL flag) + { return(*(int *)0); } + +/* ./base/version.c */ + +#undef curses_version +const char *curses_version(void) + { return(*(const char **)0); } diff --git a/ncurses/llib-ltinfotw b/ncurses/llib-ltinfotw index ea89c2be..ec9b63d4 100644 --- a/ncurses/llib-ltinfotw +++ b/ncurses/llib-ltinfotw @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2012 Free Software Foundation, Inc. * + * Copyright (c) 2012,2013 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 * @@ -294,6 +294,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 @@ -765,17 +771,17 @@ void use_env_sp( NCURSES_BOOL f) { /* void */ } -#undef use_env -void use_env( - 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) @@ -962,7 +968,7 @@ int _nc_tparm_err; int _nc_tparm_analyze( const char *string, char *p_is_s[9], - int *popcount) + int *_nc_popcount) { return(*(int *)0); } #undef tparm @@ -1022,12 +1028,28 @@ 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, @@ -1035,11 +1057,6 @@ int _nc_putp_sp( const char *string) { return(*(int *)0); } -#undef putp -int putp( - const char *string) - { return(*(int *)0); } - #undef _nc_putp int _nc_putp( const char *name, @@ -1378,10 +1395,30 @@ char *const *_nc_strnames(void) char *const *_nc_strfnames(void) { return(*(char **)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 +#undef _nc_init_termtype +void _nc_init_termtype( + TERMTYPE *const tp) + { /* void */ } + #undef _nc_read_termtype int _nc_read_termtype( TERMTYPE *ptr, @@ -1410,21 +1447,6 @@ int _nc_read_entry( void _nc_read_termcap(void) { /* void */ } -/* ./tinfo/setbuf.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/strings.c */ #undef _nc_str_init diff --git a/ncurses/llib-ltinfow b/ncurses/llib-ltinfow index 4829fc32..f2196983 100644 --- a/ncurses/llib-ltinfow +++ b/ncurses/llib-ltinfow @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2012 Free Software Foundation, Inc. * + * Copyright (c) 2012,2013 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 * @@ -289,6 +289,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 @@ -694,17 +700,17 @@ void use_env_sp( NCURSES_BOOL f) { /* void */ } -#undef use_env -void use_env( - 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) @@ -891,7 +897,7 @@ int _nc_tparm_err; int _nc_tparm_analyze( const char *string, char *p_is_s[9], - int *popcount) + int *_nc_popcount) { return(*(int *)0); } #undef tparm @@ -951,12 +957,28 @@ 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, @@ -964,11 +986,6 @@ int _nc_putp_sp( const char *string) { return(*(int *)0); } -#undef putp -int putp( - const char *string) - { return(*(int *)0); } - #undef _nc_putp int _nc_putp( const char *name, @@ -1269,10 +1286,30 @@ char *const strnames[] = {0}; #undef strfnames 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 +#undef _nc_init_termtype +void _nc_init_termtype( + TERMTYPE *const tp) + { /* void */ } + #undef _nc_read_termtype int _nc_read_termtype( TERMTYPE *ptr, @@ -1301,21 +1338,6 @@ int _nc_read_entry( void _nc_read_termcap(void) { /* void */ } -/* ./tinfo/setbuf.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/strings.c */ #undef _nc_str_init diff --git a/ncurses/tinfo/db_iterator.c b/ncurses/tinfo/db_iterator.c index f9f0258e..a14fb216 100644 --- a/ncurses/tinfo/db_iterator.c +++ b/ncurses/tinfo/db_iterator.c @@ -43,7 +43,7 @@ #include #endif -MODULE_ID("$Id: db_iterator.c,v 1.37 2013/11/16 19:42:56 tom Exp $") +MODULE_ID("$Id: db_iterator.c,v 1.38 2013/12/14 21:23:20 tom Exp $") #define HaveTicDirectory _nc_globals.have_tic_directory #define KeepTicDirectory _nc_globals.keep_tic_directory @@ -185,10 +185,12 @@ _nc_tic_dir(const char *path) if (path != 0) { TicDirectory = path; HaveTicDirectory = TRUE; - } else if (HaveTicDirectory == 0 && use_terminfo_vars()) { - char *envp; - if ((envp = getenv("TERMINFO")) != 0) - return _nc_tic_dir(envp); + } else if (HaveTicDirectory == 0) { + if (use_terminfo_vars()) { + char *envp; + if ((envp = getenv("TERMINFO")) != 0) + return _nc_tic_dir(envp); + } } } return TicDirectory ? TicDirectory : TERMINFO; diff --git a/ncurses/tinfo/hashed_db.c b/ncurses/tinfo/hashed_db.c index 1b3eb97d..b5942058 100644 --- a/ncurses/tinfo/hashed_db.c +++ b/ncurses/tinfo/hashed_db.c @@ -36,7 +36,7 @@ #if USE_HASHED_DB -MODULE_ID("$Id: hashed_db.c,v 1.16 2013/02/16 21:50:03 tom Exp $") +MODULE_ID("$Id: hashed_db.c,v 1.17 2013/12/15 00:33:01 tom Exp $") #if HASHED_DB_API >= 2 static DBC *cursor; @@ -286,7 +286,7 @@ NCURSES_EXPORT(bool) _nc_db_have_index(DBT * key, DBT * data, char **buffer, int *size) { bool result = FALSE; - int used = data->size - 1; + int used = (int) data->size - 1; char *have = (char *) data->data; (void) key; @@ -309,7 +309,7 @@ NCURSES_EXPORT(bool) _nc_db_have_data(DBT * key, DBT * data, char **buffer, int *size) { bool result = FALSE; - int used = data->size - 1; + int used = (int) data->size - 1; char *have = (char *) data->data; if (*have++ == 0) { diff --git a/ncurses/tinfo/lib_baudrate.c b/ncurses/tinfo/lib_baudrate.c index 9302f022..252d03c5 100644 --- a/ncurses/tinfo/lib_baudrate.c +++ b/ncurses/tinfo/lib_baudrate.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * + * Copyright (c) 1998-2010,2013 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 * @@ -49,7 +49,7 @@ * of the indices up to B115200 fit nicely in a 'short', allowing us to retain * ospeed's type for compatibility. */ -#if (defined(__FreeBSD__) && (__FreeBSD_version < 700000)) || defined(__NetBSD__) || defined(__OpenBSD__) +#if NCURSES_OSPEED_COMPAT && ((defined(__FreeBSD__) && (__FreeBSD_version < 700000)) || defined(__NetBSD__) || defined(__OpenBSD__)) #undef B0 #undef B50 #undef B75 @@ -79,7 +79,7 @@ #undef USE_OLD_TTY #endif /* USE_OLD_TTY */ -MODULE_ID("$Id: lib_baudrate.c,v 1.31 2010/12/19 01:50:50 tom Exp $") +MODULE_ID("$Id: lib_baudrate.c,v 1.34 2013/12/15 01:29:02 tom Exp $") /* * int @@ -90,54 +90,55 @@ MODULE_ID("$Id: lib_baudrate.c,v 1.31 2010/12/19 01:50:50 tom Exp $") */ struct speed { - int s; /* value for 'ospeed' is an index */ + NCURSES_OSPEED s; /* values for 'ospeed' */ int sp; /* the actual speed */ }; +#define DATA(number) { B##number, number } + static struct speed const speeds[] = { - {B0, 0}, - {B50, 50}, - {B75, 75}, - {B110, 110}, - {B134, 134}, - {B150, 150}, - {B200, 200}, - {B300, 300}, - {B600, 600}, - {B1200, 1200}, - {B1800, 1800}, - {B2400, 2400}, - {B4800, 4800}, - {B9600, 9600}, + DATA(0), + DATA(50), + DATA(75), + DATA(110), + DATA(134), + DATA(150), + DATA(200), + DATA(300), + DATA(600), + DATA(1200), + DATA(1800), + DATA(2400), + DATA(4800), + DATA(9600), #ifdef B19200 - {B19200, 19200}, -#else -#ifdef EXTA + DATA(19200), +#elif defined(EXTA) {EXTA, 19200}, #endif -#endif #ifdef B38400 - {B38400, 38400}, -#else -#ifdef EXTB + DATA(38400), +#elif defined(EXTB) {EXTB, 38400}, #endif -#endif #ifdef B57600 - {B57600, 57600}, + DATA(57600), #endif + /* ifdef to prevent overflow when OLD_TTY is not available */ +#if !(NCURSES_OSPEED_COMPAT && defined(__FreeBSD__) && (__FreeBSD_version > 700000)) #ifdef B115200 - {B115200, 115200}, + DATA(115200), #endif #ifdef B230400 - {B230400, 230400}, + DATA(230400), #endif #ifdef B460800 - {B460800, 460800}, + DATA(460800), #endif #ifdef B921600 - {B921600, 921600}, + DATA(921600), +#endif #endif }; @@ -167,7 +168,7 @@ _nc_baudrate(int OSpeed) } } #if !USE_REENTRANT - if (OSpeed == last_OSpeed) { + if (OSpeed != last_OSpeed) { last_OSpeed = OSpeed; last_baudrate = result; } @@ -219,8 +220,8 @@ NCURSES_SP_NAME(baudrate) (NCURSES_SP_DCL0) if (IsValidTIScreen(SP_PARM)) { #ifdef USE_OLD_TTY - result = cfgetospeed(&(TerminalOf(SP_PARM)->Nttyb)); - ospeed = _nc_ospeed(result); + result = (int) cfgetospeed(&(TerminalOf(SP_PARM)->Nttyb)); + ospeed = (NCURSES_OSPEED) _nc_ospeed(result); #else /* !USE_OLD_TTY */ #ifdef TERMIOS ospeed = (NCURSES_OSPEED) cfgetospeed(&(TerminalOf(SP_PARM)->Nttyb)); diff --git a/ncurses/tinfo/lib_options.c b/ncurses/tinfo/lib_options.c index c2db70d3..e1cda4eb 100644 --- a/ncurses/tinfo/lib_options.c +++ b/ncurses/tinfo/lib_options.c @@ -46,7 +46,7 @@ #define CUR SP_TERMTYPE #endif -MODULE_ID("$Id: lib_options.c,v 1.75 2013/11/16 19:25:39 tom Exp $") +MODULE_ID("$Id: lib_options.c,v 1.76 2013/12/14 22:23:58 tom Exp $") NCURSES_EXPORT(int) idlok(WINDOW *win, bool flag) @@ -56,7 +56,11 @@ idlok(WINDOW *win, bool flag) if (win) { SCREEN *sp = _nc_screen_of(win); - if (sp != 0 && IsTermInfo(sp)) { + if (sp != 0 +#ifdef USE_TERM_DRIVER + && IsTermInfo(sp) +#endif + ) { sp->_nc_sp_idlok = win->_idlok = (flag && (NCURSES_SP_NAME(has_il) (NCURSES_SP_ARG) || change_scroll_region)); diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c index 0c825d53..435b0b5d 100644 --- a/ncurses/tinfo/read_entry.c +++ b/ncurses/tinfo/read_entry.c @@ -41,7 +41,7 @@ #include -MODULE_ID("$Id: read_entry.c,v 1.125 2013/08/17 19:06:59 tom Exp $") +MODULE_ID("$Id: read_entry.c,v 1.126 2013/12/15 00:35:36 tom Exp $") #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts)) @@ -434,9 +434,9 @@ make_db_filename(char *filename, unsigned limit, const char *const path) { static const char suffix[] = DBM_SUFFIX; - unsigned lens = sizeof(suffix) - 1; - unsigned size = strlen(path); - unsigned test = lens + size; + size_t lens = sizeof(suffix) - 1; + size_t size = strlen(path); + size_t test = lens + size; bool result = FALSE; if (test < limit) { @@ -520,7 +520,7 @@ _nc_read_tic_entry(char *filename, * (source/binary) by checking the lengths. */ while (_nc_db_get(capdbp, &key, &data) == 0) { - int used = data.size - 1; + int used = (int) data.size - 1; char *have = (char *) data.data; if (*have++ == 0) { diff --git a/ncurses/tinfo/read_termcap.c b/ncurses/tinfo/read_termcap.c index 05e57df2..6bfb23cd 100644 --- a/ncurses/tinfo/read_termcap.c +++ b/ncurses/tinfo/read_termcap.c @@ -56,7 +56,7 @@ #include #include -MODULE_ID("$Id: read_termcap.c,v 1.88 2013/07/13 22:11:06 tom Exp $") +MODULE_ID("$Id: read_termcap.c,v 1.89 2013/12/15 00:32:43 tom Exp $") #if !PURE_TERMINFO @@ -770,7 +770,7 @@ copy_tc_token(char *dst, const char *src, size_t len) dst = 0; break; } - *dst++ = ch; + *dst++ = (char) ch; } return dst; } @@ -887,7 +887,7 @@ _nc_tgetent(char *bp, char **sourcename, int *lineno, const char *name) } if (ignore != TRUE) { list[count++] = tok; - pd = copy_tc_token(pd, tok, TBUFSIZ - (2 + pd - bp)); + pd = copy_tc_token(pd, tok, (size_t) (TBUFSIZ - (2 + pd - bp))); if (pd == 0) { i = -1; break; diff --git a/ncurses/tinfo/write_entry.c b/ncurses/tinfo/write_entry.c index ebde343e..77f90cb5 100644 --- a/ncurses/tinfo/write_entry.c +++ b/ncurses/tinfo/write_entry.c @@ -47,7 +47,7 @@ #define TRACE_OUT(p) /*nothing */ #endif -MODULE_ID("$Id: write_entry.c,v 1.90 2013/11/16 19:58:14 tom Exp $") +MODULE_ID("$Id: write_entry.c,v 1.91 2013/12/14 21:29:42 tom Exp $") static int total_written; @@ -191,7 +191,10 @@ _nc_set_writedir(char *dir) char actual[PATH_MAX]; if (dir == 0 - && use_terminfo_vars()) +#ifndef USE_ROOT_ENVIRON + && use_terminfo_vars() +#endif + ) dir = getenv("TERMINFO"); if (dir != 0) diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index d9a808db..02f45007 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9-20131207) unstable; urgency=low +ncurses6 (5.9-20131214) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 07 Dec 2013 10:21:58 -0500 + -- Thomas E. Dickey Sat, 14 Dec 2013 12:30:25 -0500 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index d9a808db..02f45007 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9-20131207) unstable; urgency=low +ncurses6 (5.9-20131214) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 07 Dec 2013 10:21:58 -0500 + -- Thomas E. Dickey Sat, 14 Dec 2013 12:30:25 -0500 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index d35fd446..4baeecb4 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9-20131207) unstable; urgency=low +ncurses6 (5.9-20131214) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 07 Dec 2013 10:21:58 -0500 + -- Thomas E. Dickey Sat, 14 Dec 2013 12:30:25 -0500 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 779d4bc8..61b6158c 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.17 2013/12/07 15:21:58 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.18 2013/12/14 17:30:25 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "5" !define VERSION_MINOR "9" !define VERSION_YYYY "2013" -!define VERSION_MMDD "1207" +!define VERSION_MMDD "1214" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 14eb56d5..ccdb411f 100644 --- a/package/mingw-ncurses.spec +++ b/package/mingw-ncurses.spec @@ -3,7 +3,7 @@ Summary: shared libraries for terminal handling Name: mingw32-ncurses6 Version: 5.9 -Release: 20131207 +Release: 20131214 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index 2b4c4180..ce6e52c4 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 5.9 -Release: 20131207 +Release: 20131214 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/progs/dump_entry.c b/progs/dump_entry.c index 823cfdcd..65de9f9b 100644 --- a/progs/dump_entry.c +++ b/progs/dump_entry.c @@ -39,7 +39,7 @@ #include "termsort.c" /* this C file is generated */ #include /* so is this */ -MODULE_ID("$Id: dump_entry.c,v 1.110 2013/11/16 19:58:01 tom Exp $") +MODULE_ID("$Id: dump_entry.c,v 1.111 2013/12/15 01:05:20 tom Exp $") #define INDENT 8 #define DISCARD(string) string = ABSENT_STRING @@ -467,7 +467,7 @@ indent_DYN(DYNBUF * buffer, int level) int n; for (n = 0; n < level; n++) - strncpy_DYN(buffer, "\t", 1); + strncpy_DYN(buffer, "\t", (size_t) 1); } static bool @@ -480,9 +480,9 @@ has_params(const char *src) bool params = FALSE; for (n = 0; n < len - 1; ++n) { - if (!strncmp(src + n, "%p", 2)) { + if (!strncmp(src + n, "%p", (size_t) 2)) { params = TRUE; - } else if (!strncmp(src + n, "%;", 2)) { + } else if (!strncmp(src + n, "%;", (size_t) 2)) { ifthen = TRUE; result = params; break; @@ -504,7 +504,7 @@ fmt_complex(TERMTYPE *tterm, const char *capability, char *src, int level) switch (*src) { case '\\': percent = FALSE; - strncpy_DYN(&tmpbuf, src++, 1); + strncpy_DYN(&tmpbuf, src++, (size_t) 1); break; case '%': percent = TRUE; @@ -518,22 +518,22 @@ fmt_complex(TERMTYPE *tterm, const char *capability, char *src, int level) /* treat a "%e" as else-if, on the same level */ if (*src == 'e') { indent_DYN(&tmpbuf, level); - strncpy_DYN(&tmpbuf, "%", 1); - strncpy_DYN(&tmpbuf, src, 1); + strncpy_DYN(&tmpbuf, "%", (size_t) 1); + strncpy_DYN(&tmpbuf, src, (size_t) 1); src++; params = has_params(src); if (!params && *src != '\0' && *src != '%') { - strncpy_DYN(&tmpbuf, "\n", 1); + strncpy_DYN(&tmpbuf, "\n", (size_t) 1); indent_DYN(&tmpbuf, level + 1); } } else { indent_DYN(&tmpbuf, level + 1); - strncpy_DYN(&tmpbuf, "%", 1); - strncpy_DYN(&tmpbuf, src, 1); + strncpy_DYN(&tmpbuf, "%", (size_t) 1); + strncpy_DYN(&tmpbuf, src, (size_t) 1); if (*src++ == '?') { src = fmt_complex(tterm, capability, src, level + 1); if (*src != '\0' && *src != '%') { - strncpy_DYN(&tmpbuf, "\n", 1); + strncpy_DYN(&tmpbuf, "\n", (size_t) 1); indent_DYN(&tmpbuf, level + 1); } } else if (level == 1) { @@ -551,8 +551,8 @@ fmt_complex(TERMTYPE *tterm, const char *capability, char *src, int level) if (level > 1) { tmpbuf.text[tmpbuf.used - 1] = '\n'; indent_DYN(&tmpbuf, level); - strncpy_DYN(&tmpbuf, "%", 1); - strncpy_DYN(&tmpbuf, src++, 1); + strncpy_DYN(&tmpbuf, "%", (size_t) 1); + strncpy_DYN(&tmpbuf, src++, (size_t) 1); if (src[0] == '%' && src[1] != '\0' && (strchr("?e;", src[1])) == 0) { @@ -570,20 +570,20 @@ fmt_complex(TERMTYPE *tterm, const char *capability, char *src, int level) if (percent && params) { tmpbuf.text[tmpbuf.used - 1] = '\n'; indent_DYN(&tmpbuf, level + 1); - strncpy_DYN(&tmpbuf, "%", 1); + strncpy_DYN(&tmpbuf, "%", (size_t) 1); } params = FALSE; percent = FALSE; break; case ' ': - strncpy_DYN(&tmpbuf, "\\s", 2); + strncpy_DYN(&tmpbuf, "\\s", (size_t) 2); ++src; continue; default: percent = FALSE; break; } - strncpy_DYN(&tmpbuf, src++, 1); + strncpy_DYN(&tmpbuf, src++, (size_t) 1); } return src; } @@ -594,9 +594,9 @@ fmt_complex(TERMTYPE *tterm, const char *capability, char *src, int level) int fmt_entry(TERMTYPE *tterm, PredFunc pred, - bool content_only, - bool suppress_untranslatable, - bool infodump, + int content_only, + int suppress_untranslatable, + int infodump, int numbers) { PredIdx i, j; @@ -1104,8 +1104,8 @@ purged_acs(TERMTYPE *tterm) */ void dump_entry(TERMTYPE *tterm, - bool suppress_untranslatable, - bool limited, + int suppress_untranslatable, + int limited, int numbers, PredFunc pred) { diff --git a/progs/dump_entry.h b/progs/dump_entry.h index 807b51c0..cb2a44fe 100644 --- a/progs/dump_entry.h +++ b/progs/dump_entry.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2008,2011 Free Software Foundation, Inc. * + * Copyright (c) 1998-2011,2013 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 * @@ -33,7 +33,7 @@ ****************************************************************************/ /* - * $Id: dump_entry.h,v 1.32 2011/08/06 16:33:05 tom Exp $ + * $Id: dump_entry.h,v 1.33 2013/12/15 01:08:03 tom Exp $ * * Dump control definitions and variables */ @@ -67,10 +67,10 @@ typedef int (*PredFunc) (PredType, PredIdx); typedef void (*PredHook) (PredType, PredIdx, const char *); extern NCURSES_CONST char *nametrans(const char *); -extern int fmt_entry(TERMTYPE *, PredFunc, bool, bool, bool, int); +extern int fmt_entry(TERMTYPE *, PredFunc, int, int, int, int); extern int show_entry(void); extern void compare_entry(PredHook, TERMTYPE *, bool); -extern void dump_entry(TERMTYPE *, bool, bool, int, PredFunc); +extern void dump_entry(TERMTYPE *, int, int, int, PredFunc); extern void dump_init(const char *, int, int, int, int, unsigned, bool); extern void dump_uses(const char *, bool); extern void repair_acsc(TERMTYPE *tp); diff --git a/progs/infocmp.c b/progs/infocmp.c index fc57c155..d52d05a6 100644 --- a/progs/infocmp.c +++ b/progs/infocmp.c @@ -42,7 +42,7 @@ #include -MODULE_ID("$Id: infocmp.c,v 1.127 2013/11/16 20:26:09 tom Exp $") +MODULE_ID("$Id: infocmp.c,v 1.128 2013/12/15 01:06:52 tom Exp $") #define L_CURL "{" #define R_CURL "}" @@ -818,7 +818,7 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp) if (_nc_capcmp(cp, buf2)) continue; -#define ISRS(s) (!strncmp((s), "is", 2) || !strncmp((s), "rs", 2)) +#define ISRS(s) (!strncmp((s), "is", (size_t) 2) || !strncmp((s), "rs", (size_t) 2)) /* * Theoretically we just passed the test for translation * (equality once the padding is stripped). However, there diff --git a/progs/toe.c b/progs/toe.c index d57a5fe4..0d299b45 100644 --- a/progs/toe.c +++ b/progs/toe.c @@ -44,7 +44,7 @@ #include #endif -MODULE_ID("$Id: toe.c,v 1.72 2013/05/25 20:13:07 tom Exp $") +MODULE_ID("$Id: toe.c,v 1.74 2013/12/15 01:08:28 tom Exp $") #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, "..")) @@ -232,9 +232,9 @@ make_db_name(char *dst, const char *src, unsigned limit) static const char suffix[] = DBM_SUFFIX; bool result = FALSE; - unsigned lens = sizeof(suffix) - 1; - unsigned size = strlen(src); - unsigned need = lens + size; + size_t lens = sizeof(suffix) - 1; + size_t size = strlen(src); + size_t need = lens + size; if (need <= limit) { if (size >= lens @@ -367,7 +367,7 @@ copy_entryname(DIRENT * src) static int typelist(int eargc, char *eargv[], - bool verbosity, + int verbosity, DescHook hook) /* apply a function to each entry in given terminfo directories */ { @@ -721,7 +721,7 @@ main(int argc, char *argv[]) DBDIRS state; int offset; const char *path; - char **eargv = allocArgv(2); + char **eargv = allocArgv((size_t) 2); size_t count = 0; if (eargv == 0) diff --git a/progs/tset.c b/progs/tset.c index 21203e3d..f01acd72 100644 --- a/progs/tset.c +++ b/progs/tset.c @@ -119,7 +119,7 @@ char *ttyname(int fd); #include #include -MODULE_ID("$Id: tset.c,v 1.92 2013/10/12 22:17:20 tom Exp $") +MODULE_ID("$Id: tset.c,v 1.93 2013/12/15 01:05:56 tom Exp $") /* * SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS, @@ -635,13 +635,14 @@ get_termcap_entry(char *userarg) * real entry from /etc/termcap. This prevents us from being fooled * by out of date stuff in the environment. */ - found:if ((p = getenv("TERMCAP")) != 0 && !_nc_is_abs_path(p)) { + found: + if ((p = getenv("TERMCAP")) != 0 && !_nc_is_abs_path(p)) { /* 'unsetenv("TERMCAP")' is not portable. * The 'environ' array is better. */ int n; for (n = 0; environ[n] != 0; n++) { - if (!strncmp("TERMCAP=", environ[n], 8)) { + if (!strncmp("TERMCAP=", environ[n], (size_t) 8)) { while ((environ[n] = environ[n + 1]) != 0) { n++; } -- 2.45.0