ncurses 6.4 - patch 20240414

[ncurses.git] / ncurses / new_pair.h

diff --git a/ncurses/new_pair.h b/ncurses/new_pair.h
index 49828d4a7725010d92935841baf5d064383f520e..49d7e8b8dbdd2b1cf2385d02c531795fcc4c6b63 100644 (file)
--- a/ncurses/new_pair.h
+++ b/ncurses/new_pair.h
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 2017,2018 Free Software Foundation, Inc.                   *
+ * 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  *
  * copy of this software and associated documentation files (the            *
@@ -33,13 +34,22 @@
 /*
  * Common type definitions and macros for new_pair.c, lib_color.c
  *
- * $Id: new_pair.h,v 1.9 2018/03/01 15:02:12 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 <ncurses_cfg.h>
+#include <ncurses_dll.h>
+
+#include <sys/types.h>
+
+#undef SCREEN
+#define SCREEN struct screen
+SCREEN;
+
 #define LIMIT_TYPED(n,t) \
        (t)(((n) > MAX_OF_TYPE(t)) \
            ? MAX_OF_TYPE(t) \
@@ -76,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