diff options
| author | rafan <rafan@FreeBSD.org> | 2008-11-15 09:23:48 +0000 |
|---|---|---|
| committer | rafan <rafan@FreeBSD.org> | 2008-11-15 09:23:48 +0000 |
| commit | f5d83322529691706652e1ae0137d16f59d4e367 (patch) | |
| tree | b736f10477d660dd3f6822f50c28f2899139567c /contrib/ncurses/panel | |
| parent | fe573b41d7842682795440ba8e319fc72acc3bf8 (diff) | |
| parent | d078158b4620b1f1230c46d47fefc1263619ac98 (diff) | |
| download | FreeBSD-src-f5d83322529691706652e1ae0137d16f59d4e367.zip FreeBSD-src-f5d83322529691706652e1ae0137d16f59d4e367.tar.gz | |
- Update ncurses to 5.7-20081102 (5.7 release) and build glue
- This also removes $FreeBSD$ from two now unmodifed source files
ncurses/tinfo/lib_raw.c and ncurses/tinfo/lib_baudrate.c
MFC after: 2 months (after 7.1 and 6.4 are released)
Diffstat (limited to 'contrib/ncurses/panel')
| -rw-r--r-- | contrib/ncurses/panel/p_new.c | 9 | ||||
| -rw-r--r-- | contrib/ncurses/panel/panel.priv.h | 12 |
2 files changed, 9 insertions, 12 deletions
diff --git a/contrib/ncurses/panel/p_new.c b/contrib/ncurses/panel/p_new.c index 3e48e36..2719316 100644 --- a/contrib/ncurses/panel/p_new.c +++ b/contrib/ncurses/panel/p_new.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc. * + * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -29,6 +29,8 @@ /**************************************************************************** * Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995 * * and: Eric S. Raymond <esr@snark.thyrsus.com> * + * and: Juergen Pfeifer 1997-1999 * + * and: Thomas E. Dickey 2000-on * ****************************************************************************/ /* p_new.c @@ -36,7 +38,7 @@ */ #include "panel.priv.h" -MODULE_ID("$Id: p_new.c,v 1.8 2005/02/19 16:41:03 tom Exp $") +MODULE_ID("$Id: p_new.c,v 1.10 2008/08/04 18:25:48 tom Exp $") #ifdef TRACE static char *stdscr_id; @@ -54,6 +56,9 @@ root_panel(void) { assert(stdscr && !_nc_bottom_panel && !_nc_top_panel); +#if NO_LEAKS + _nc_panelhook()->destroy = del_panel; +#endif _nc_stdscr_pseudo_panel = (PANEL *) malloc(sizeof(PANEL)); if (_nc_stdscr_pseudo_panel != 0) { diff --git a/contrib/ncurses/panel/panel.priv.h b/contrib/ncurses/panel/panel.priv.h index 98d741f..4fb8144 100644 --- a/contrib/ncurses/panel/panel.priv.h +++ b/contrib/ncurses/panel/panel.priv.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2001,2005 Free Software Foundation, Inc. * + * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -26,7 +26,7 @@ * authorization. * ****************************************************************************/ -/* $Id: panel.priv.h,v 1.21 2005/11/26 15:27:00 tom Exp $ */ +/* $Id: panel.priv.h,v 1.22 2008/09/27 22:36:11 tom Exp $ */ #ifndef NCURSES_PANEL_PRIV_H #define NCURSES_PANEL_PRIV_H 1 @@ -39,14 +39,6 @@ #include <string.h> #include <assert.h> -#if HAVE_LIBDMALLOC -# include <dmalloc.h> /* Gray Watson's library */ -#endif - -#if HAVE_LIBDBMALLOC -# include <dbmalloc.h> /* Conor Cahill's library */ -#endif - #include "curses.priv.h" #include "panel.h" #include <nc_panel.h> |
