X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fnew_pair.h;h=49d7e8b8dbdd2b1cf2385d02c531795fcc4c6b63;hp=811abc11442b3395ee9928f1eb902fe6c2801ee5;hb=461e72d1826483cb2c2cb243412f2dc5b00b2b1a;hpb=47d2fb4537d9ad5bb14f4810561a327930ca4280 diff --git a/ncurses/new_pair.h b/ncurses/new_pair.h index 811abc11..49d7e8b8 100644 --- a/ncurses/new_pair.h +++ b/ncurses/new_pair.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 2018-2020,2021 Thomas E. Dickey * * Copyright 2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -34,13 +34,22 @@ /* * Common type definitions and macros for new_pair.c, lib_color.c * - * $Id: new_pair.h,v 1.10 2020/02/02 23:34:34 tom Exp $ + * $Id: new_pair.h,v 1.13 2021/09/24 17:52:01 tom Exp $ */ #ifndef NEW_PAIR_H #define NEW_PAIR_H 1 /* *INDENT-OFF* */ +#include +#include + +#include + +#undef SCREEN +#define SCREEN struct screen +SCREEN; + #define LIMIT_TYPED(n,t) \ (t)(((n) > MAX_OF_TYPE(t)) \ ? MAX_OF_TYPE(t) \ @@ -77,8 +86,7 @@ typedef enum { cpKEEP = -1, /* color pair 0 */ cpFREE = 0, /* free for use */ - cpINIT = 1, /* init_pair() */ - cpAUTO = 1 /* alloc_pair() */ + cpINIT = 1 /* initialized */ } CPMODE; typedef struct _color_pairs