ncurses 5.8 - patch 20110305

[ncurses.git] / form / frm_data.c

diff --git a/form/frm_data.c b/form/frm_data.c
index e52b1bece25dfe3cb7c27f395585d779e9a75a41..93917d5bbea1a82d8d18f8d12e0e3227d075c54a 100644 (file)
--- a/form/frm_data.c
+++ b/form/frm_data.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -32,7 +32,7 @@
 
 #include "form.priv.h"
 
 
 #include "form.priv.h"
 

-MODULE_ID("$Id: frm_data.c,v 1.13 2004/12/11 22:29:28 tom Exp $")
+MODULE_ID("$Id: frm_data.c,v 1.15 2010/01/23 21:14:36 tom Exp $")

 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform  
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform  


@@ -49,7 +49,7 @@ data_behind(const FORM *form)
 {
   bool result = FALSE;
 
 {
   bool result = FALSE;
 

-  T((T_CALLED("data_behind(%p)"), form));
+  T((T_CALLED("data_behind(%p)"), (const void *)form));

 
   if (form && (form->status & _POSTED) && form->current)
     {
 
   if (form && (form->status & _POSTED) && form->current)
     {


@@ -80,7 +80,7 @@ data_behind(const FORM *form)
 |
 |   Return Values :  true if only padding cells are found
 +--------------------------------------------------------------------------*/
 |
 |   Return Values :  true if only padding cells are found
 +--------------------------------------------------------------------------*/

-INLINE static bool
+NCURSES_INLINE static bool

 Only_Padding(WINDOW *w, int len, int pad)
 {
   bool result = TRUE;
 Only_Padding(WINDOW *w, int len, int pad)
 {
   bool result = TRUE;


@@ -136,7 +136,7 @@ data_ahead(const FORM *form)
 {
   bool result = FALSE;
 
 {
   bool result = FALSE;
 

-  T((T_CALLED("data_ahead(%p)"), form));
+  T((T_CALLED("data_ahead(%p)"), (const void *)form));

 
   if (form && (form->status & _POSTED) && form->current)
     {
 
   if (form && (form->status & _POSTED) && form->current)
     {