From 2f5be2a67ca3f21100fd13e325b2986bb7b322bc Mon Sep 17 00:00:00 2001
From: "Thomas E. Dickey" <dickey@invisible-island.net>
Date: Sun, 20 Nov 2011 02:38:21 +0000
Subject: [PATCH] ncurses 5.9 - patch 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).
---
 NEWS                        | 11 ++++++++++-
 dist.mk                     |  4 ++--
 ncurses/curses.priv.h       |  6 +-----
 ncurses/tinfo/db_iterator.c |  4 ++--
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/NEWS b/NEWS
index de3b9aad..9a9e9d61 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.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
diff --git a/dist.mk b/dist.mk
index 2c945eac..dcffcdac 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.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 c8df3fc0..2dcc7254 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 35185855..74cffad3 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;
 }
 
 /*
-- 
2.45.0