diff options
Diffstat (limited to 'contrib/ncurses/include/nc_alloc.h')
| -rw-r--r-- | contrib/ncurses/include/nc_alloc.h | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/contrib/ncurses/include/nc_alloc.h b/contrib/ncurses/include/nc_alloc.h index 356f6056d521..c24c8a36e934 100644 --- a/contrib/ncurses/include/nc_alloc.h +++ b/contrib/ncurses/include/nc_alloc.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. * + * Copyright (c) 1998-2017,2019 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,12 +29,15 @@ /**************************************************************************** * Author: Thomas E. Dickey 1996-on * ****************************************************************************/ -/* $Id: nc_alloc.h,v 1.22 2013/01/26 21:56:51 tom Exp $ */ +/* $Id: nc_alloc.h,v 1.24 2019/12/15 01:00:51 tom Exp $ */ #ifndef NC_ALLOC_included #define NC_ALLOC_included 1 /* *INDENT-OFF* */ +#include <ncurses_cfg.h> +#include <curses.h> + #ifdef __cplusplus extern "C" { #endif @@ -69,8 +72,9 @@ extern "C" { #if HAVE_LIBDBMALLOC || HAVE_LIBDMALLOC || NO_LEAKS #define HAVE_NC_FREEALL 1 struct termtype; -extern NCURSES_EXPORT(void) _nc_free_and_exit(int) GCC_NORETURN; -extern NCURSES_EXPORT(void) _nc_free_tinfo(int) GCC_NORETURN; +extern NCURSES_EXPORT(void) _nc_free_tinfo(int) GCC_NORETURN GCC_DEPRECATED("use exit_terminfo"); + +#ifdef NCURSES_INTERNALS extern NCURSES_EXPORT(void) _nc_free_tic(int) GCC_NORETURN; extern NCURSES_EXPORT(void) _nc_free_tparm(void); extern NCURSES_EXPORT(void) _nc_leaks_dump_entry(void); @@ -79,8 +83,13 @@ extern NCURSES_EXPORT(void) _nc_leaks_tic(void); #if NCURSES_SP_FUNCS extern NCURSES_EXPORT(void) NCURSES_SP_NAME(_nc_free_and_exit)(SCREEN*, int) GCC_NORETURN; #endif +extern NCURSES_EXPORT(void) _nc_free_and_exit(int) GCC_NORETURN; + +#else /* !NCURSES_INTERNALS */ +extern NCURSES_EXPORT(void) _nc_free_and_exit(int) GCC_NORETURN GCC_DEPRECATED("use exit_curses"); +#endif -#define ExitProgram(code) _nc_free_and_exit(code) +#define ExitProgram(code) exit_curses(code) #endif /* NO_LEAKS, etc */ |