diff options
Diffstat (limited to 'progs/progs.priv.h')
| -rw-r--r-- | progs/progs.priv.h | 37 |
1 files changed, 34 insertions, 3 deletions
diff --git a/progs/progs.priv.h b/progs/progs.priv.h index 3ead89f85d200..da34790275f3d 100644 --- a/progs/progs.priv.h +++ b/progs/progs.priv.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2011,2012 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,13 +30,16 @@ * Author: Thomas E. Dickey 1997-on * ****************************************************************************/ /* - * $Id: progs.priv.h,v 1.39 2012/02/22 22:11:27 tom Exp $ + * $Id: progs.priv.h,v 1.47 2019/12/14 23:53:12 tom Exp $ * * progs.priv.h * * Header file for curses utility programs */ +#ifndef PROGS_PRIV_H +#define PROGS_PRIV_H 1 + #include <ncurses_cfg.h> #if USE_RCS_IDS @@ -115,6 +118,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> @@ -123,15 +129,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 @@ -200,3 +221,13 @@ extern int optind; #define UChar(c) ((unsigned char)(c)) #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 */ |