ncurses 5.9 - patch 20141018

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

diff --git a/ncurses/base/lib_slkcolor.c b/ncurses/base/lib_slkcolor.c
index 17550bd13c81e2e221ae0388d1453982b21d8ea5..2cf9e5d7f1213348e83e9fb311dab6dc6e08bd69 100644 (file)
--- a/ncurses/base/lib_slkcolor.c
+++ b/ncurses/base/lib_slkcolor.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2009,2014 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,14 +38,14 @@
  */
 #include <curses.priv.h>
 
  */
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_slkcolor.c,v 1.15 2009/02/21 16:59:50 tom Exp $")
+MODULE_ID("$Id: lib_slkcolor.c,v 1.17 2014/02/01 22:10:42 tom Exp $")

 
 NCURSES_EXPORT(int)
 
 NCURSES_EXPORT(int)

-NCURSES_SP_NAME(slk_color) (NCURSES_SP_DCLx short color_pair_number)
+NCURSES_SP_NAME(slk_color) (NCURSES_SP_DCLx NCURSES_PAIRS_T color_pair_number)

 {
     int code = ERR;
 
 {
     int code = ERR;
 

-    T((T_CALLED("slk_color(%p,%d)"), SP_PARM, color_pair_number));
+    T((T_CALLED("slk_color(%p,%d)"), (void *) SP_PARM, (int) color_pair_number));

 
     if (SP_PARM != 0
        && SP_PARM->_slk != 0
 
     if (SP_PARM != 0
        && SP_PARM->_slk != 0


@@ -61,7 +61,7 @@ NCURSES_SP_NAME(slk_color) (NCURSES_SP_DCLx short color_pair_number)
 
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)
 
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(int)

-slk_color(short color_pair_number)
+slk_color(NCURSES_PAIRS_T color_pair_number)

 {
     return NCURSES_SP_NAME(slk_color) (CURRENT_SCREEN, color_pair_number);
 }
 {
     return NCURSES_SP_NAME(slk_color) (CURRENT_SCREEN, color_pair_number);
 }