From ece13bc77a81efe28665e88a58a4d1470d9b1a6f Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Sun, 6 Feb 2000 07:10:52 +0000 Subject: ncurses-5.0-20000205 --- lib/libcurses/curses.h | 4 ++-- lib/libcurses/curses.priv.h | 11 ++++++++--- lib/libcurses/ncurses_cfg.h | 6 +++++- lib/libcurses/tinfo/lib_napms.c | 6 ++---- lib/libcurses/tty/lib_twait.c | 6 ++---- lib/libcurses/tty/tty_update.c | 6 ++---- 6 files changed, 21 insertions(+), 18 deletions(-) diff --git a/lib/libcurses/curses.h b/lib/libcurses/curses.h index 3b1aded0c2e..f00fe3a543a 100644 --- a/lib/libcurses/curses.h +++ b/lib/libcurses/curses.h @@ -1,4 +1,4 @@ -/* $OpenBSD: curses.h,v 1.45 2000/01/23 04:57:41 millert Exp $ */ +/* $OpenBSD: curses.h,v 1.46 2000/02/06 07:10:50 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998 Free Software Foundation, Inc. * @@ -50,7 +50,7 @@ /* These are defined only in curses.h, and are used for conditional compiles */ #define NCURSES_VERSION_MAJOR 5 #define NCURSES_VERSION_MINOR 0 -#define NCURSES_VERSION_PATCH 20000122 +#define NCURSES_VERSION_PATCH 20000129 /* This is defined in more than one ncurses header, for identification */ #undef NCURSES_VERSION diff --git a/lib/libcurses/curses.priv.h b/lib/libcurses/curses.priv.h index 7f1c55e4dca..afd0aedefe6 100644 --- a/lib/libcurses/curses.priv.h +++ b/lib/libcurses/curses.priv.h @@ -1,4 +1,4 @@ -/* $OpenBSD: curses.priv.h,v 1.23 2000/01/09 05:06:01 millert Exp $ */ +/* $OpenBSD: curses.priv.h,v 1.24 2000/02/06 07:10:50 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998 Free Software Foundation, Inc. * @@ -35,7 +35,7 @@ /* - * $From: curses.priv.h,v 1.149 2000/01/08 17:17:39 tom Exp $ + * $From: curses.priv.h,v 1.151 2000/02/06 01:57:01 tom Exp $ * * curses.priv.h * @@ -99,8 +99,13 @@ extern int errno; #include /* Some systems have a broken 'select()', but workable 'poll()'. Use that */ -#if HAVE_POLL && HAVE_SYS_STROPTS_H && HAVE_POLL_H +#if HAVE_WORKING_POLL #define USE_FUNC_POLL 1 +#ifdef HAVE_POLL_H +#include +#else +#include +#endif #else #define USE_FUNC_POLL 0 #endif diff --git a/lib/libcurses/ncurses_cfg.h b/lib/libcurses/ncurses_cfg.h index 44cacb60cc7..397919a34b5 100644 --- a/lib/libcurses/ncurses_cfg.h +++ b/lib/libcurses/ncurses_cfg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ncurses_cfg.h,v 1.16 2000/01/08 06:26:25 millert Exp $ */ +/* $OpenBSD: ncurses_cfg.h,v 1.17 2000/02/06 07:10:50 millert Exp $ */ /* include/ncurses_cfg.h. Generated automatically by configure. */ /**************************************************************************** @@ -68,6 +68,7 @@ /* #define HAVE_LIBMENU 1 */ /* #define HAVE_LIBPANEL 1 */ #define HAVE_LIMITS_H 1 +#define HAVE_LINK 1 #define HAVE_LOCALE_H 1 #define HAVE_LONG_FILE_NAMES 1 #define HAVE_MEMCCPY 1 @@ -89,8 +90,10 @@ #define HAVE_SIZECHANGE 1 #define HAVE_STRDUP 1 #define HAVE_STRSTR 1 +#define HAVE_SYMLINK 1 #define HAVE_SYS_IOCTL_H 1 #define HAVE_SYS_PARAM_H 1 +#define HAVE_SYS_POLL_H 1 #define HAVE_SYS_SELECT_H 1 #define HAVE_SYS_TIMES_H 1 #define HAVE_SYS_TIME_H 1 @@ -106,6 +109,7 @@ #define HAVE_USE_DEFAULT_COLORS 1 #define HAVE_VSNPRINTF 1 #define HAVE_VSSCANF 1 +#define HAVE_WORKING_POLL 1 #define HAVE_WRESIZE 1 #define NCURSES_EXT_FUNCS 1 #define NCURSES_NO_PADDING 1 diff --git a/lib/libcurses/tinfo/lib_napms.c b/lib/libcurses/tinfo/lib_napms.c index 39da90f4a97..83fc564b71f 100644 --- a/lib/libcurses/tinfo/lib_napms.c +++ b/lib/libcurses/tinfo/lib_napms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lib_napms.c,v 1.3 1999/11/28 17:49:54 millert Exp $ */ +/* $OpenBSD: lib_napms.c,v 1.4 2000/02/06 07:10:51 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998 Free Software Foundation, Inc. * @@ -46,8 +46,6 @@ #if HAVE_NANOSLEEP #include #elif USE_FUNC_POLL -#include -#include #if HAVE_SYS_TIME_H #include #endif @@ -60,7 +58,7 @@ #endif #endif -MODULE_ID("$From: lib_napms.c,v 1.6 1999/10/21 23:01:41 tom Exp $") +MODULE_ID("$From: lib_napms.c,v 1.7 2000/02/06 01:57:10 tom Exp $") int napms(int ms) { diff --git a/lib/libcurses/tty/lib_twait.c b/lib/libcurses/tty/lib_twait.c index 0d330245f48..c2e06a4dd55 100644 --- a/lib/libcurses/tty/lib_twait.c +++ b/lib/libcurses/tty/lib_twait.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lib_twait.c,v 1.2 1999/11/28 17:49:54 millert Exp $ */ +/* $OpenBSD: lib_twait.c,v 1.3 2000/02/06 07:10:51 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998 Free Software Foundation, Inc. * @@ -49,8 +49,6 @@ #include #if USE_FUNC_POLL -# include -# include # if HAVE_SYS_TIME_H # include # endif @@ -63,7 +61,7 @@ # endif #endif -MODULE_ID("$From: lib_twait.c,v 1.34 1999/10/16 21:25:10 tom Exp $") +MODULE_ID("$From: lib_twait.c,v 1.35 2000/02/06 01:57:16 tom Exp $") static long _nc_gettime(bool first) { diff --git a/lib/libcurses/tty/tty_update.c b/lib/libcurses/tty/tty_update.c index 07102426eeb..b278daaee9a 100644 --- a/lib/libcurses/tty/tty_update.c +++ b/lib/libcurses/tty/tty_update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty_update.c,v 1.5 2000/01/16 01:35:18 millert Exp $ */ +/* $OpenBSD: tty_update.c,v 1.6 2000/02/06 07:10:51 millert Exp $ */ /**************************************************************************** * Copyright (c) 1998-2000 Free Software Foundation, Inc. * @@ -65,8 +65,6 @@ #endif #if USE_FUNC_POLL -#include -#include #elif HAVE_SELECT #if HAVE_SYS_SELECT_H #include @@ -75,7 +73,7 @@ #include -MODULE_ID("$From: tty_update.c,v 1.123 2000/01/15 23:49:36 tom Exp $") +MODULE_ID("$From: tty_update.c,v 1.124 2000/02/06 01:57:25 tom Exp $") /* * This define controls the line-breakout optimization. Every once in a -- cgit v1.2.3