ncurses 6.2 - patch 20200912

[ncurses.git] / menu / m_item_opt.c

diff --git a/menu/m_item_opt.c b/menu/m_item_opt.c
index cfe7b75db392bb7e2c403f1ce4520ad7bc015afe..c40eb3ab8f8ddc1fe473f1c4244d9990849b0b18 100644 (file)
--- a/menu/m_item_opt.c
+++ b/menu/m_item_opt.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 1998-2004,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            *


@@ -37,7 +38,7 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_item_opt.c,v 1.17 2004/12/25 21:32:54 tom Exp $")
+MODULE_ID("$Id: m_item_opt.c,v 1.20 2020/05/24 01:40:20 anonymous.maarten Exp $")

 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnmenu  
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnmenu  


@@ -50,10 +51,10 @@ MODULE_ID("$Id: m_item_opt.c,v 1.17 2004/12/25 21:32:54 tom Exp $")
 |   Return Values :  E_OK            - success
 |                    E_BAD_ARGUMENT  - invalid item options
 +--------------------------------------------------------------------------*/
 |   Return Values :  E_OK            - success
 |                    E_BAD_ARGUMENT  - invalid item options
 +--------------------------------------------------------------------------*/

-NCURSES_EXPORT(int)
+MENU_EXPORT(int)

 set_item_opts(ITEM * item, Item_Options opts)
 {
 set_item_opts(ITEM * item, Item_Options opts)
 {

-  T((T_CALLED("set_menu_opts(%p,%d)"), item, opts));
+  T((T_CALLED("set_menu_opts(%p,%d)"), (void *)item, opts));

 
   opts &= ALL_ITEM_OPTS;
 
 
   opts &= ALL_ITEM_OPTS;
 


@@ -93,14 +94,14 @@ set_item_opts(ITEM * item, Item_Options opts)
 |   Return Values :  E_OK            - success
 |                    E_BAD_ARGUMENT  - invalid options
 +--------------------------------------------------------------------------*/
 |   Return Values :  E_OK            - success
 |                    E_BAD_ARGUMENT  - invalid options
 +--------------------------------------------------------------------------*/

-NCURSES_EXPORT(int)
+MENU_EXPORT(int)

 item_opts_off(ITEM * item, Item_Options opts)
 {
   ITEM *citem = item;          /* use a copy because set_item_opts must detect
 
                                   NULL item itself to adjust its behavior */
 
 item_opts_off(ITEM * item, Item_Options opts)
 {
   ITEM *citem = item;          /* use a copy because set_item_opts must detect
 
                                   NULL item itself to adjust its behavior */
 

-  T((T_CALLED("item_opts_off(%p,%d)"), item, opts));
+  T((T_CALLED("item_opts_off(%p,%d)"), (void *)item, opts));

 
   if (opts & ~ALL_ITEM_OPTS)
     RETURN(E_BAD_ARGUMENT);
 
   if (opts & ~ALL_ITEM_OPTS)
     RETURN(E_BAD_ARGUMENT);


@@ -121,14 +122,14 @@ item_opts_off(ITEM * item, Item_Options opts)
 |   Return Values :  E_OK            - success
 |                    E_BAD_ARGUMENT  - invalid options
 +--------------------------------------------------------------------------*/
 |   Return Values :  E_OK            - success
 |                    E_BAD_ARGUMENT  - invalid options
 +--------------------------------------------------------------------------*/

-NCURSES_EXPORT(int)
+MENU_EXPORT(int)

 item_opts_on(ITEM * item, Item_Options opts)
 {
   ITEM *citem = item;          /* use a copy because set_item_opts must detect
 
                                   NULL item itself to adjust its behavior */
 
 item_opts_on(ITEM * item, Item_Options opts)
 {
   ITEM *citem = item;          /* use a copy because set_item_opts must detect
 
                                   NULL item itself to adjust its behavior */
 

-  T((T_CALLED("item_opts_on(%p,%d)"), item, opts));
+  T((T_CALLED("item_opts_on(%p,%d)"), (void *)item, opts));

 
   opts &= ALL_ITEM_OPTS;
   if (opts & ~ALL_ITEM_OPTS)
 
   opts &= ALL_ITEM_OPTS;
   if (opts & ~ALL_ITEM_OPTS)


@@ -149,10 +150,10 @@ item_opts_on(ITEM * item, Item_Options opts)
 |
 |   Return Values :  Items options
 +--------------------------------------------------------------------------*/
 |
 |   Return Values :  Items options
 +--------------------------------------------------------------------------*/

-NCURSES_EXPORT(Item_Options)
+MENU_EXPORT(Item_Options)

 item_opts(const ITEM * item)
 {
 item_opts(const ITEM * item)
 {

-  T((T_CALLED("item_opts(%p)"), item));
+  T((T_CALLED("item_opts(%p)"), (const void *)item));

   returnItemOpts(ALL_ITEM_OPTS & Normalize_Item(item)->opt);
 }
 
   returnItemOpts(ALL_ITEM_OPTS & Normalize_Item(item)->opt);
 }