ncurses 6.0 - patch 20170506

[ncurses.git] / ncurses / new_pair.h

diff --git a/ncurses/new_pair.h b/ncurses/new_pair.h
index f5153d5b947b9a76f318511fea92b37ea8348058..e34b4bed2e3a1d1efab6255a30a8947bdbe1bbce 100644 (file)
--- a/ncurses/new_pair.h
+++ b/ncurses/new_pair.h
@@ -33,7 +33,7 @@
 /*
  * Common type definitions and macros for new_pair.c, lib_color.c
  *
- * $Id: new_pair.h,v 1.4 2017/03/31 11:32:07 tom Exp $
+ * $Id: new_pair.h,v 1.6 2017/04/29 20:25:29 tom Exp $
  */
 
 #ifndef NEW_PAIR_H
@@ -42,8 +42,12 @@
 
 #define USE_NEW_PAIR NCURSES_EXT_COLORS
 
-#define MAX_OF_TYPE(t)   (int)(((unsigned t)(~0))>>1)
-#define LIMIT_TYPED(n,t) (t)(((t)(n) < 0) ? MAX_OF_TYPE(t) : (n))
+#define LIMIT_TYPED(n,t) \
+       (t)(((n) > MAX_OF_TYPE(t)) \
+           ? MAX_OF_TYPE(t) \
+           : ((n) < -MAX_OF_TYPE(t)) \
+              ? -MAX_OF_TYPE(t) \
+              : (n))
 
 #define limit_COLOR(n) LIMIT_TYPED(n,NCURSES_COLOR_T)
 #define limit_PAIRS(n) LIMIT_TYPED(n,NCURSES_PAIRS_T)