=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tic/progs.priv.h,v retrieving revision 1.10 retrieving revision 1.11 diff -c -r1.10 -r1.11 *** src/usr.bin/tic/progs.priv.h 2015/01/16 06:40:13 1.10 --- src/usr.bin/tic/progs.priv.h 2023/10/17 09:52:10 1.11 *************** *** 1,7 **** ! /* $OpenBSD: progs.priv.h,v 1.10 2015/01/16 06:40:13 deraadt Exp $ */ /**************************************************************************** ! * Copyright (c) 1998-2007,2008 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 * --- 1,8 ---- ! /* $OpenBSD: progs.priv.h,v 1.11 2023/10/17 09:52:10 nicm Exp $ */ /**************************************************************************** ! * Copyright 2019-2021,2022 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 * *************** *** 32,50 **** * Author: Thomas E. Dickey 1997-on * ****************************************************************************/ /* ! * $Id: progs.priv.h,v 1.10 2015/01/16 06:40:13 deraadt Exp $ * * progs.priv.h * * Header file for curses utility programs */ #include #if USE_RCS_IDS #define MODULE_ID(id) static const char Ident[] = id; #else ! #define MODULE_ID(id) /*nothing*/ #endif #include --- 33,54 ---- * Author: Thomas E. Dickey 1997-on * ****************************************************************************/ /* ! * $Id: progs.priv.h,v 1.11 2023/10/17 09:52:10 nicm Exp $ * * progs.priv.h * * Header file for curses utility programs */ + #ifndef PROGS_PRIV_H + #define PROGS_PRIV_H 1 + #include #if USE_RCS_IDS #define MODULE_ID(id) static const char Ident[] = id; #else ! #define MODULE_ID(id) /*nothing */ #endif #include *************** *** 56,69 **** #include #endif - #if HAVE_SYS_BSDTYPES_H - #include /* needed for ISC */ - #endif - #if HAVE_LIMITS_H # include #elif HAVE_SYS_PARAM_H ! # include /* only if no limits.h */ #endif #if HAVE_DIRENT_H --- 60,69 ---- #include #endif #if HAVE_LIMITS_H # include #elif HAVE_SYS_PARAM_H ! # include #endif #if HAVE_DIRENT_H *************** *** 92,97 **** --- 92,105 ---- # endif #endif + #if HAVE_INTTYPES_H + # include + #else + # if HAVE_STDINT_H + # include + # endif + #endif + #include #include *************** *** 101,107 **** #if HAVE_GETOPT_H #include ! #else /* 'getopt()' may be prototyped in , but declaring its * variables doesn't hurt. */ --- 109,115 ---- #if HAVE_GETOPT_H #include ! #elif !defined(HAVE_GETOPT_HEADER) /* 'getopt()' may be prototyped in , but declaring its * variables doesn't hurt. */ *************** *** 109,130 **** extern int optind; #endif /* HAVE_GETOPT_H */ #include #include #include #include #include #if HAVE_NC_FREEALL #undef ExitProgram #ifdef USE_LIBTINFO ! #define ExitProgram(code) _nc_free_tinfo(code) #else #define ExitProgram(code) _nc_free_tic(code) #endif #endif /* usually in */ #ifndef STDOUT_FILENO #define STDOUT_FILENO 1 #endif --- 117,171 ---- extern int optind; #endif /* HAVE_GETOPT_H */ + #undef _NC_WINDOWS + #if (defined(_WIN32) || defined(_WIN64)) + #define _NC_WINDOWS 1 + #endif + + #define NCURSES_INTERNALS 1 + #define NCURSES_OPAQUE 0 + #include + + #if !(defined(NCURSES_WGETCH_EVENTS) && defined(NEED_KEY_EVENT)) + #undef KEY_EVENT /* reduce compiler-warnings with Visual C++ */ + #endif + #include + #include #include #include + #include #include + #include + #if HAVE_NC_FREEALL #undef ExitProgram #ifdef USE_LIBTINFO ! #define ExitProgram(code) exit_terminfo(code) #else #define ExitProgram(code) _nc_free_tic(code) #endif #endif + /* 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 */ + #ifndef STDIN_FILENO + #define STDIN_FILENO 0 + #endif + #ifndef STDOUT_FILENO #define STDOUT_FILENO 1 #endif *************** *** 173,179 **** # elif defined(MAXPATHLEN) # define PATH_MAX MAXPATHLEN # else ! # define PATH_MAX 255 /* the Posix minimum pathsize */ # endif #endif --- 214,220 ---- # elif defined(MAXPATHLEN) # define PATH_MAX MAXPATHLEN # else ! # define PATH_MAX 255 /* the Posix minimum pathsize */ # endif #endif *************** *** 185,194 **** # if ('z'-'a' == 25) && ('z' < 127) && ('Z'-'A' == 25) && ('Z' < 127) && ('9' < 127) # define isascii(c) (UChar(c) <= 127) # else ! # define isascii(c) 1 /* not really ascii anyway */ # endif #endif #define UChar(c) ((unsigned char)(c)) #define SIZEOF(v) (sizeof(v)/sizeof(v[0])) --- 226,265 ---- # if ('z'-'a' == 25) && ('z' < 127) && ('Z'-'A' == 25) && ('Z' < 127) && ('9' < 127) # define isascii(c) (UChar(c) <= 127) # else ! # define isascii(c) 1 /* not really ascii anyway */ # endif #endif #define UChar(c) ((unsigned char)(c)) #define SIZEOF(v) (sizeof(v)/sizeof(v[0])) + + #define VtoTrace(opt) (unsigned) ((opt > 0) ? opt : (opt == 0)) + + /* + * If configured for tracing, the debug- and trace-output are merged together + * in the trace file for "upper" levels of the verbose option. + */ + #ifdef TRACE + #define use_verbosity(level) do { \ + set_trace_level(level); \ + if (_nc_tracing > DEBUG_LEVEL(2)) \ + _nc_tracing |= TRACE_MAXIMUM; \ + else if (_nc_tracing == DEBUG_LEVEL(2)) \ + _nc_tracing |= TRACE_ORDINARY; \ + if (level >= 2) \ + curses_trace(_nc_tracing); \ + } while (0) + #else + #define use_verbosity(level) do { set_trace_level(level); } while (0) + #endif + + #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 */