X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=progs%2Fprogs.priv.h;h=85d3acc6524054dde251b7715c1dc075e6d8d8a0;hp=3ead89f85d200a7eef41b49d0683733352efc6d6;hb=b793748293cd1a764b1a858455399ad899b5a8a1;hpb=8b06e371ed1bce3dd6f37138e6becb5e1a562fe0 diff --git a/progs/progs.priv.h b/progs/progs.priv.h index 3ead89f8..85d3acc6 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-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,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.43 2017/04/06 23:02:26 tom Exp $ * * progs.priv.h * * Header file for curses utility programs */ +#ifndef PROGS_PRIV_H +#define PROGS_PRIV_H 1 + #include #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 #include #include @@ -132,6 +138,12 @@ extern int optind; #endif #endif +#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 STDOUT_FILENO #define STDOUT_FILENO 1 @@ -200,3 +212,12 @@ 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) +#endif + +#endif /* PROGS_PRIV_H */