From: Thomas E. Dickey <dickey@invisible-island.net>
Date: Mon, 27 Jun 2011 00:36:16 +0000 (+0000)
Subject: ncurses 5.9 - patch 20110626
X-Git-Tag: v6.0~199
X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=5e9dacf37f4f807f4e09bd98874f32d6e4f9a37a

ncurses 5.9 - patch 20110626

+ move include of nc_termios.h out of term_entry.h, since the latter
  is installed, e.g., for tack while the former is not (report by
  Sven Joachim).
---

diff --git a/NEWS b/NEWS
index c1a3665c..6a39fa36 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.1726 2011/06/25 21:20:22 tom Exp $
+-- $Id: NEWS,v 1.1727 2011/06/26 10:37:58 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,11 @@ 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.
 
+20110626
+	+ move include of nc_termios.h out of term_entry.h, since the latter
+	  is installed, e.g., for tack while the former is not (report by
+	  Sven Joachim).
+
 20110625
 	+ improve cleanup() function in lib_tstp.c, using _exit() rather than
 	  exit() and checking for SIGTERM rather than SIGQUIT (prompted by
diff --git a/dist.mk b/dist.mk
index 3397ff2d..9aed7af6 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.822 2011/06/25 19:02:07 tom Exp $
+# $Id: dist.mk,v 1.823 2011/06/26 09:32:11 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 = 20110625
+NCURSES_PATCH = 20110626
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/include/term_entry.h b/include/term_entry.h
index cd496fa3..bc715a7e 100644
--- a/include/term_entry.h
+++ b/include/term_entry.h
@@ -32,7 +32,7 @@
  *     and: Thomas E. Dickey                        1998-on                 *
  ****************************************************************************/
 
-/* $Id: term_entry.h,v 1.38 2011/06/25 20:51:00 tom Exp $ */
+/* $Id: term_entry.h,v 1.39 2011/06/26 09:31:32 tom Exp $ */
 
 /*
  *	term_entry.h -- interface to entry-manipulation code
@@ -46,7 +46,6 @@ extern "C" {
 #endif
 
 #include <term.h>
-#include <nc_termios.h>
 
 #define MAX_USES	32
 #define MAX_CROSSLINKS	16
diff --git a/progs/progs.priv.h b/progs/progs.priv.h
index 363b1b9e..63ff9a7b 100644
--- a/progs/progs.priv.h
+++ b/progs/progs.priv.h
@@ -30,7 +30,7 @@
  *  Author: Thomas E. Dickey                    1997-on                     *
  ****************************************************************************/
 /*
- * $Id: progs.priv.h,v 1.35 2011/04/23 22:33:09 tom Exp $
+ * $Id: progs.priv.h,v 1.36 2011/06/26 09:31:22 tom Exp $
  *
  *	progs.priv.h
  *
@@ -109,6 +109,7 @@ extern int optind;
 
 #include <curses.h>
 #include <term_entry.h>
+#include <nc_termios.h>
 #include <tic.h>
 #include <nc_tparm.h>