X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=progs%2Fprogs.priv.h;h=da34790275f3d62316e0b30b21b497c701f71ddb;hp=85d3acc6524054dde251b7715c1dc075e6d8d8a0;hb=0ff9bcb7f97617085a8b8cba4a7ee374bb969cc9;hpb=5e1e572b71ae31a6071daa24e2460a68a6f1003c diff --git a/progs/progs.priv.h b/progs/progs.priv.h index 85d3acc6..da347902 100644 --- a/progs/progs.priv.h +++ b/progs/progs.priv.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2015,2017 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 * @@ -30,7 +30,7 @@ * Author: Thomas E. Dickey 1997-on * ****************************************************************************/ /* - * $Id: progs.priv.h,v 1.43 2017/04/06 23:02:26 tom Exp $ + * $Id: progs.priv.h,v 1.47 2019/12/14 23:53:12 tom Exp $ * * progs.priv.h * @@ -129,15 +129,24 @@ extern int optind; #include #include + #if HAVE_NC_FREEALL #undef ExitProgram #ifdef USE_LIBTINFO -#define ExitProgram(code) _nc_free_tinfo(code) +#define ExitProgram(code) exit_terminfo(code) #else #define ExitProgram(code) _nc_free_tic(code) #endif #endif +#define VtoTrace(opt) (unsigned) ((opt > 0) ? opt : (opt == 0)) + +/* error-returns for tput */ +#define ErrUsage 2 +#define ErrTermType 3 +#define ErrCapName 4 +#define ErrSystem(n) (4 + (n)) + #if defined(__GNUC__) && defined(_FORTIFY_SOURCE) #define IGNORE_RC(func) errno = (int) func #else @@ -218,6 +227,7 @@ extern int optind; #if NCURSES_EXT_NUMBERS #else #define _nc_free_termtype2(t) _nc_free_termtype(t) +#define _nc_read_entry2(n,f,t) _nc_read_entry(n,f,t) #endif #endif /* PROGS_PRIV_H */