X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=include%2Fnc_alloc.h;h=8d19f98e0f6754d9e0c777a8e721f5b70ad413ab;hp=356f6056d5210f6c2b9a409d1c27a7be84455881;hb=66762a2208108bce308007649047be9f0edbb346;hpb=2403eaecbe5b488358485a3deb351ab552af8791 diff --git a/include/nc_alloc.h b/include/nc_alloc.h index 356f6056..8d19f98e 100644 --- a/include/nc_alloc.h +++ b/include/nc_alloc.h @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 1998-2012,2013 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,12 +30,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.27 2020/07/04 20:01:13 tom Exp $ */ #ifndef NC_ALLOC_included #define NC_ALLOC_included 1 /* *INDENT-OFF* */ +#include +#include + #ifdef __cplusplus extern "C" { #endif @@ -69,19 +73,27 @@ 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); +extern void _nc_leaks_dump_entry(void); 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; -#define ExitProgram(code) _nc_free_and_exit(code) +#else /* !NCURSES_INTERNALS */ +extern NCURSES_EXPORT(void) _nc_free_and_exit(int) GCC_NORETURN GCC_DEPRECATED("use exit_curses"); +#endif + +#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