ncurses 6.2 - patch 20200328

[ncurses.git] / menu / m_sub.c

diff --git a/menu/m_sub.c b/menu/m_sub.c
index ae77f075809d48edd8133cb1d57477bd0f155484..4658e90e5a0743b23fb488fd7bbcf5ce25cf83ad 100644 (file)
--- a/menu/m_sub.c
+++ b/menu/m_sub.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2003,2004 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            *


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

-MODULE_ID("$Id: m_sub.c,v 1.11 2009/04/05 00:35:51 tom Exp $")
+MODULE_ID("$Id: m_sub.c,v 1.13 2020/02/02 23:34:34 tom Exp $")

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


@@ -51,7 +52,7 @@ MODULE_ID("$Id: m_sub.c,v 1.11 2009/04/05 00:35:51 tom Exp $")
 NCURSES_EXPORT(int)
 set_menu_sub(MENU * menu, WINDOW *win)
 {
 NCURSES_EXPORT(int)
 set_menu_sub(MENU * menu, WINDOW *win)
 {

-  T((T_CALLED("set_menu_sub(%p,%p)"), menu, win));
+  T((T_CALLED("set_menu_sub(%p,%p)"), (void *)menu, (void *)win));

 
   if (menu)
     {
 
   if (menu)
     {


@@ -93,7 +94,7 @@ menu_sub(const MENU * menu)
 {
   const MENU *m = Normalize_Menu(menu);
 
 {
   const MENU *m = Normalize_Menu(menu);
 

-  T((T_CALLED("menu_sub(%p)"), menu));
+  T((T_CALLED("menu_sub(%p)"), (const void *)menu));

   returnWin(Get_Menu_Window(m));
 }
 
   returnWin(Get_Menu_Window(m));
 }