diff options
Diffstat (limited to 'progs/progs.priv.h')
| -rw-r--r-- | progs/progs.priv.h | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/progs/progs.priv.h b/progs/progs.priv.h index c1cc1e6..da7a515 100644 --- a/progs/progs.priv.h +++ b/progs/progs.priv.h @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 1998-2012,2014 Free Software Foundation, Inc. * + * Copyright 2019,2020 Thomas E. Dickey * + * Copyright 1998-2015,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 * @@ -30,7 +31,7 @@ * Author: Thomas E. Dickey 1997-on * ****************************************************************************/ /* - * $Id: progs.priv.h,v 1.40 2014/05/21 17:00:19 tom Exp $ + * $Id: progs.priv.h,v 1.48 2020/02/02 23:34:34 tom Exp $ * * progs.priv.h * @@ -118,6 +119,9 @@ extern char *optarg; extern int optind; #endif /* HAVE_GETOPT_H */ +#define NCURSES_INTERNALS 1 +#define NCURSES_OPAQUE 0 + #include <curses.h> #include <term_entry.h> #include <nc_termios.h> @@ -126,15 +130,30 @@ extern int optind; #include <nc_string.h> #include <nc_alloc.h> + #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 +#define IGNORE_RC(func) (void) func +#endif /* gcc workarounds */ + /* usually in <unistd.h> */ #ifndef STDOUT_FILENO #define STDOUT_FILENO 1 @@ -204,4 +223,12 @@ extern int optind; #define SIZEOF(v) (sizeof(v)/sizeof(v[0])) +#define NCURSES_EXT_NUMBERS (NCURSES_EXT_COLORS && HAVE_INIT_EXTENDED_COLOR) + +#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 */ |