ncurses 5.7 - patch 20090419

+ build fix for _nc_free_and_exit() change in 20090418 (report by
  Christian Ebert).

diff --git a/NEWS b/NEWS
index d19470753cc58d9b15d030cd40a6f69584e7b931..4f64d6134e09955586e5bc669e014ce8580c2002 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------

--- $Id: NEWS,v 1.1381 2009/04/18 18:42:28 tom Exp $
+-- $Id: NEWS,v 1.1382 2009/04/19 14:39:28 tom Exp $

 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started


@@ -45,6 +45,10 @@ 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.
 
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 

+20090419
+       + build fix for _nc_free_and_exit() change in 20090418 (report by
+         Christian Ebert).
+

 20090418
        + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete).
 
 20090418
        + continue integrating "sp-funcs" by Juergen Pfeifer (incomplete).
 

diff --git a/dist.mk b/dist.mk
index a60f70ef807485ae74383b3cf8fead6abbc46aa2..b872947cd9353e9cb482fe96882bec1eaecc2a55 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################

-# $Id: dist.mk,v 1.694 2009/04/18 15:21:05 tom Exp $
+# $Id: dist.mk,v 1.695 2009/04/19 14:38:20 tom Exp $

 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
 # 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 = 7
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 7

-NCURSES_PATCH = 20090418
+NCURSES_PATCH = 20090419

 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/ncurses/base/lib_freeall.c b/ncurses/base/lib_freeall.c
index 5856dd547cd85f527f70dd4922fcb8fbd13d4b8b..dbdf443f00821155f1998aaf361c1a760fe796a2 100644 (file)
--- a/ncurses/base/lib_freeall.c
+++ b/ncurses/base/lib_freeall.c
@@ -40,7 +40,7 @@
 extern int malloc_errfd;       /* FIXME */
 #endif
 
 extern int malloc_errfd;       /* FIXME */
 #endif
 

-MODULE_ID("$Id: lib_freeall.c,v 1.56 2009/04/18 17:18:56 tom Exp $")
+MODULE_ID("$Id: lib_freeall.c,v 1.57 2009/04/19 14:31:26 tom Exp $")

 
 /*
  * Free all ncurses data.  This is used for testing only (there's no practical
 
 /*
  * Free all ncurses data.  This is used for testing only (there's no practical


@@ -152,12 +152,12 @@ _nc_freeall(void)
 }
 
 NCURSES_EXPORT(void)
 }
 
 NCURSES_EXPORT(void)

-NCURSES_SP_NAME(_nc_free_and_exit) (SCREEN *SP_PARM, int code)
+NCURSES_SP_NAME(_nc_free_and_exit) (NCURSES_SP_DCLx int code)

 {
     if (SP_PARM) {
        delscreen(SP_PARM);
        if (SP_PARM->_term)
 {
     if (SP_PARM) {
        delscreen(SP_PARM);
        if (SP_PARM->_term)

-           NCURSES_SP_NAME(_nc_del_curterm) (SP_PARM, SP_PARM->_term);
+           NCURSES_SP_NAME(del_curterm) (NCURSES_SP_ARGx SP_PARM->_term);

     }
     exit(code);
 }
     }
     exit(code);
 }

diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 0903813e76c22aafcd49d98a61d0fa317abec65a..a8e0c0bf87fcd94b82f0bda189009b7ee234f09c 100644 (file)
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
 
 
 /*
 
 
 /*

- * $Id: curses.priv.h,v 1.407 2009/04/18 23:42:28 tom Exp $
+ * $Id: curses.priv.h,v 1.408 2009/04/19 14:32:33 tom Exp $

  *
  *     curses.priv.h
  *
  *
  *     curses.priv.h
  *


@@ -1789,7 +1789,6 @@ extern NCURSES_EXPORT(WINDOW *) _nc_stdscr_of(SCREEN*);
 extern NCURSES_EXPORT(int)      _nc_outc_wrapper(SCREEN*,int);
 
 extern NCURSES_EXPORT(TERMINAL*) NCURSES_SP_NAME(_nc_set_curterm)(SCREEN*,TERMINAL*);
 extern NCURSES_EXPORT(int)      _nc_outc_wrapper(SCREEN*,int);
 
 extern NCURSES_EXPORT(TERMINAL*) NCURSES_SP_NAME(_nc_set_curterm)(SCREEN*,TERMINAL*);

-extern NCURSES_EXPORT(int)       NCURSES_SP_NAME(_nc_del_curterm)(SCREEN*,TERMINAL*);

 
 #if NCURSES_EXT_FUNCS
 extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_set_tabsize)(SCREEN*, int);
 
 #if NCURSES_EXT_FUNCS
 extern NCURSES_EXPORT(int)      NCURSES_SP_NAME(_nc_set_tabsize)(SCREEN*, int);