ncurses 6.2 - patch 20210213

[ncurses.git] / ncurses / base / lib_slkattr.c

diff --git a/ncurses/base/lib_slkattr.c b/ncurses/base/lib_slkattr.c
index 2e254da4a36ec11be06e2fdbc22680c767fb58a4..af49f3bb7c05e9a0ef1552191efb19c2a120dff0 100644 (file)
--- a/ncurses/base/lib_slkattr.c
+++ b/ncurses/base/lib_slkattr.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2000,2009 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 1998-2009,2010 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            *
@@ -38,18 +39,18 @@
  */
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_slkattr.c,v 1.8 2009/02/21 17:48:14 tom Exp $")
+MODULE_ID("$Id: lib_slkattr.c,v 1.12 2020/02/02 23:34:34 tom Exp $")
 
 NCURSES_EXPORT(attr_t)
 NCURSES_SP_NAME(slk_attr) (NCURSES_SP_DCL0)
 {
-    T((T_CALLED("slk_attr(%p)"), SP_PARM));
+    T((T_CALLED("slk_attr(%p)"), (void *) SP_PARM));
 
     if (SP_PARM != 0 && SP_PARM->_slk != 0) {
        attr_t result = AttrOf(SP_PARM->_slk->attr) & ALL_BUT_COLOR;
        int pair = GetPair(SP_PARM->_slk->attr);
 
-       result |= COLOR_PAIR(pair);
+       result |= (attr_t) ColorPair(pair);
        returnAttr(result);
     } else
        returnAttr(0);