X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=include%2Fnc_alloc.h;h=ca63e78cd922c23dc87ffad42627f1db3d9ff701;hp=76a82cf35365e26ec6592f9ff997957d5755442a;hb=47d2fb4537d9ad5bb14f4810561a327930ca4280;hpb=71244b7927a8918c0b09a8eb13b017ef0ebb6de8 diff --git a/include/nc_alloc.h b/include/nc_alloc.h index 76a82cf3..ca63e78c 100644 --- a/include/nc_alloc.h +++ b/include/nc_alloc.h @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 1998-2013,2017 Free Software Foundation, Inc. * + * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 1998-2013,2017 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,7 +30,7 @@ /**************************************************************************** * Author: Thomas E. Dickey 1996-on * ****************************************************************************/ -/* $Id: nc_alloc.h,v 1.23 2017/07/22 16:59:37 tom Exp $ */ +/* $Id: nc_alloc.h,v 1.26 2020/02/02 23:34:34 tom Exp $ */ #ifndef NC_ALLOC_included #define NC_ALLOC_included 1 @@ -72,8 +73,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); @@ -82,9 +84,16 @@ 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) +#else +extern NCURSES_EXPORT(void) _nc_free_and_exit(int) GCC_NORETURN GCC_DEPRECATED("use exit_curses"); #endif /* NO_LEAKS, etc */ #ifndef HAVE_NC_FREEALL