diff options
| author | Anas Nashif <anas.nashif@intel.com> | 2012-12-27 17:23:00 -0800 |
|---|---|---|
| committer | Anas Nashif <anas.nashif@intel.com> | 2012-12-27 17:23:00 -0800 |
| commit | 45c69b71f7b161888bcb105cae8ad686cda557fd (patch) | |
| tree | de3d03f04031e0de69a6374153c73f8cde8a4c6d | |
| parent | c9c5823cef3a8775900d431d19efef2887aa3dc0 (diff) | |
| download | ncurses-45c69b71f7b161888bcb105cae8ad686cda557fd.tar.gz ncurses-45c69b71f7b161888bcb105cae8ad686cda557fd.tar.bz2 ncurses-45c69b71f7b161888bcb105cae8ad686cda557fd.zip | |
apply ncurses-5.9-20111119.patch
| -rw-r--r-- | NEWS | 11 | ||||
| -rw-r--r-- | dist.mk | 4 | ||||
| -rw-r--r-- | ncurses/curses.priv.h | 6 | ||||
| -rw-r--r-- | ncurses/tinfo/db_iterator.c | 4 |
4 files changed, 15 insertions, 10 deletions
@@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.1818 2011/11/13 02:07:55 tom Exp $ +-- $Id: NEWS,v 1.1820 2011/11/19 22:08:09 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,15 @@ 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. +20111119 + + remove obsolete/conflicting fallback definition for _POSIX_SOURCE + from curses.priv.h, fixing a regression with IRIX64 and Tru64 + (cf: 20110416) + + modify _nc_tic_dir() to ensure that its return-value is nonnull, + i.e., the database iterator was not initialized. This case is needed + to when tic is translating to termcap, rather than loading the + database (cf: 20111001). + 20111112 + add pccon entries for OpenBSD console (Alexei Malinin). + build-fix for OpenBSD 4.9 with gcc 4.2.1, setting _XOPEN_SOURCE to @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.843 2011/11/11 18:50:46 tom Exp $ +# $Id: dist.mk,v 1.844 2011/11/19 15:14:00 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 = 20111112 +NCURSES_PATCH = 20111119 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h index c8df3fc..2dcc725 100644 --- a/ncurses/curses.priv.h +++ b/ncurses/curses.priv.h @@ -34,7 +34,7 @@ ****************************************************************************/ /* - * $Id: curses.priv.h,v 1.489 2011/10/29 19:58:15 tom Exp $ + * $Id: curses.priv.h,v 1.490 2011/11/19 21:56:10 tom Exp $ * * curses.priv.h * @@ -61,10 +61,6 @@ extern "C" { #define MODULE_ID(id) /*nothing*/ #endif -#if !(defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE)) -#define _POSIX_SOURCE -#endif - #include <stddef.h> /* for offsetof */ #include <stdlib.h> #include <string.h> diff --git a/ncurses/tinfo/db_iterator.c b/ncurses/tinfo/db_iterator.c index 3518585..74cffad 100644 --- a/ncurses/tinfo/db_iterator.c +++ b/ncurses/tinfo/db_iterator.c @@ -43,7 +43,7 @@ #include <hashed_db.h> #endif -MODULE_ID("$Id: db_iterator.c,v 1.20 2011/10/08 20:55:38 tom Exp $") +MODULE_ID("$Id: db_iterator.c,v 1.21 2011/11/19 18:13:34 tom Exp $") #define HaveTicDirectory _nc_globals.have_tic_directory #define KeepTicDirectory _nc_globals.keep_tic_directory @@ -184,7 +184,7 @@ _nc_tic_dir(const char *path) return _nc_tic_dir(envp); } } - return TicDirectory; + return TicDirectory ? TicDirectory : TERMINFO; } /* |