ncurses 6.2 - patch 20200829

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

diff --git a/ncurses/base/lib_slkattr.c b/ncurses/base/lib_slkattr.c
index 9dd2ec8cc983b5dfcbcbf8cca633a2db27ab50ac..af49f3bb7c05e9a0ef1552191efb19c2a120dff0 100644 (file)
--- a/ncurses/base/lib_slkattr.c
+++ b/ncurses/base/lib_slkattr.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2009,2010 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -38,7 +39,7 @@
  */
 #include <curses.priv.h>
 
  */
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_slkattr.c,v 1.10 2010/03/31 23:38:02 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)
 
 NCURSES_EXPORT(attr_t)
 NCURSES_SP_NAME(slk_attr) (NCURSES_SP_DCL0)


@@ -49,7 +50,7 @@ NCURSES_SP_NAME(slk_attr) (NCURSES_SP_DCL0)
        attr_t result = AttrOf(SP_PARM->_slk->attr) & ALL_BUT_COLOR;
        int pair = GetPair(SP_PARM->_slk->attr);
 
        attr_t result = AttrOf(SP_PARM->_slk->attr) & ALL_BUT_COLOR;
        int pair = GetPair(SP_PARM->_slk->attr);
 

-       result |= ColorPair(pair);
+       result |= (attr_t) ColorPair(pair);

        returnAttr(result);
     } else
        returnAttr(0);
        returnAttr(result);
     } else
        returnAttr(0);