ncurses 5.7 - patch 20100123

+ for term-driver configuration, ensure that the driver pointer is
  initialized in setupterm so that terminfo/termcap programs work.
+ amend fix for Debian #542031 to ensure that wattrset() returns only
  OK or ERR, rather than the attribute value (report by Miroslav
  Lichvar).
+ reorder WINDOWLIST to put WINDOW data after SCREEN pointer, making
  _nc_screen_of() compatible between normal/wide libraries again (patch
  by Miroslav Lichvar)
+ review/fix include-dependencies in modules files (report by Miroslav
  Lichvar).

diff --git a/NEWS b/NEWS
index 3b0ef7e3eaa8e5caf8c4a81cfa87fc857f19cb67..0775981cb5369ff5d836d4396898054855fcf9e9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------

--- $Id: NEWS,v 1.1493 2010/01/16 23:47:10 tom Exp $
+-- $Id: NEWS,v 1.1497 2010/01/23 22:59:19 tom Exp $

 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started


@@ -45,6 +45,18 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 

+20100123
+       + for term-driver configuration, ensure that the driver pointer is
+         initialized in setupterm so that terminfo/termcap programs work.
+       + amend fix for Debian #542031 to ensure that wattrset() returns only
+         OK or ERR, rather than the attribute value (report by Miroslav
+         Lichvar).
+       + reorder WINDOWLIST to put WINDOW data after SCREEN pointer, making
+         _nc_screen_of() compatible between normal/wide libraries again (patch
+         by Miroslav Lichvar)
+       + review/fix include-dependencies in modules files (report by Miroslav
+         Lichvar).
+

 20100116
        + modify win_driver.c to initialize acs_map for win32 console, so
          that line-drawing works.
 20100116
        + modify win_driver.c to initialize acs_map for win32 console, so
          that line-drawing works.

diff --git a/dist.mk b/dist.mk
index 9eb944310944afe5f7b84a08296005b948ec4186..e12e7743f3d485bb37dbfb3f5106ab6b297801af 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################

-# $Id: dist.mk,v 1.742 2010/01/16 15:13:42 tom Exp $
+# $Id: dist.mk,v 1.743 2010/01/23 11:31:13 tom Exp $

 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but


@@ -37,7 +37,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 7
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 7

-NCURSES_PATCH = 20100116
+NCURSES_PATCH = 20100123

 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/form/Makefile.in b/form/Makefile.in
index 2e493f7b0d0539f917618e3dfb7fc960d9a2eaa0..61e5135b2c7f29e7df93dea662ddafec7f3df813 100644 (file)
--- a/form/Makefile.in
+++ b/form/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.49 2009/03/28 18:22:39 Charles.Wilson Exp $
+# $Id: Makefile.in,v 1.50 2010/01/23 16:26:46 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.                #
+# Copyright (c) 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 "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -133,7 +133,7 @@ $(DESTDIR)$(libdir) :
        -rm -f $@
        cp $(srcdir)/form.h $@
 
        -rm -f $@
        cp $(srcdir)/form.h $@
 

-FORM_PRIV_H = \
+HEADER_DEPS = \

        $(srcdir)/form.priv.h \
        $(srcdir)/form.h \
        ../include/mf_common.h \
        $(srcdir)/form.priv.h \
        $(srcdir)/form.h \
        ../include/mf_common.h \

diff --git a/form/f_trace.c b/form/f_trace.c
index 3bb4ccd9d772326c6b4577fbf18966ae4de222a7..6044e03c6e3a2079942ee1839d3490077da9ac4f 100644 (file)
--- a/form/f_trace.c
+++ b/form/f_trace.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: f_trace.c,v 1.1 2004/12/25 23:28:49 tom Exp $")
+MODULE_ID("$Id: f_trace.c,v 1.2 2010/01/23 21:14:36 tom Exp $")

 
 NCURSES_EXPORT(FIELD **)
 _nc_retrace_field_ptr(FIELD **code)
 {
 
 NCURSES_EXPORT(FIELD **)
 _nc_retrace_field_ptr(FIELD **code)
 {

-  T((T_RETURN("%p"), code));
+  T((T_RETURN("%p"), (void *)code));

   return code;
 }
 
 NCURSES_EXPORT(FIELD *)
 _nc_retrace_field(FIELD *code)
 {
   return code;
 }
 
 NCURSES_EXPORT(FIELD *)
 _nc_retrace_field(FIELD *code)
 {

-  T((T_RETURN("%p"), code));
+  T((T_RETURN("%p"), (void *)code));

   return code;
 }
 
 NCURSES_EXPORT(FIELDTYPE *)
 _nc_retrace_field_type(FIELDTYPE *code)
 {
   return code;
 }
 
 NCURSES_EXPORT(FIELDTYPE *)
 _nc_retrace_field_type(FIELDTYPE *code)
 {

-  T((T_RETURN("%p"), code));
+  T((T_RETURN("%p"), (void *)code));

   return code;
 }
 
 NCURSES_EXPORT(FORM *)
 _nc_retrace_form(FORM *code)
 {
   return code;
 }
 
 NCURSES_EXPORT(FORM *)
 _nc_retrace_form(FORM *code)
 {

-  T((T_RETURN("%p"), code));
+  T((T_RETURN("%p"), (void *)code));

   return code;
 }
 
   return code;
 }
 

diff --git a/form/fld_arg.c b/form/fld_arg.c
index f79a157aa5fc7dd1ed4d5cbe3d4253931fa3fa83..a07bdb195900a94239e4de6dfe4311f382929b0a 100644 (file)
--- a/form/fld_arg.c
+++ b/form/fld_arg.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: fld_arg.c,v 1.11 2004/12/25 22:20:18 tom Exp $")
+MODULE_ID("$Id: fld_arg.c,v 1.12 2010/01/23 21:14:35 tom Exp $")

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


@@ -67,7 +67,7 @@ set_fieldtype_arg(FIELDTYPE *typ,
                  void (*const free_arg) (void *))
 {
   T((T_CALLED("set_fieldtype_arg(%p,%p,%p,%p)"),
                  void (*const free_arg) (void *))
 {
   T((T_CALLED("set_fieldtype_arg(%p,%p,%p,%p)"),

-     typ, make_arg, copy_arg, free_arg));
+     (void *)typ, make_arg, copy_arg, free_arg));

 
   if (typ != 0 && make_arg != (void *)0)
     {
 
   if (typ != 0 && make_arg != (void *)0)
     {


@@ -91,7 +91,7 @@ set_fieldtype_arg(FIELDTYPE *typ,
 NCURSES_EXPORT(void *)
 field_arg(const FIELD *field)
 {
 NCURSES_EXPORT(void *)
 field_arg(const FIELD *field)
 {

-  T((T_CALLED("field_arg(%p)"), field));
+  T((T_CALLED("field_arg(%p)"), (const void *)field));

   returnVoidPtr(Normalize_Field(field)->arg);
 }
 
   returnVoidPtr(Normalize_Field(field)->arg);
 }
 

diff --git a/form/fld_attr.c b/form/fld_attr.c
index c9c08384bc7fca4f85b2bbea848655a8a4efc147..0112f009ecd4e74d453d0b49191ee894161262ec 100644 (file)
--- a/form/fld_attr.c
+++ b/form/fld_attr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: fld_attr.c,v 1.10 2004/12/11 21:33:15 tom Exp $")
+MODULE_ID("$Id: fld_attr.c,v 1.11 2010/01/23 21:12:08 tom Exp $")

 
 /*----------------------------------------------------------------------------
   Field-Attribute manipulation routines
 
 /*----------------------------------------------------------------------------
   Field-Attribute manipulation routines


@@ -66,7 +66,7 @@ NCURSES_IMPEXP int NCURSES_API set_field_ ## name (FIELD * field, chtype attr)\
 #define GEN_FIELD_ATTR_GET_FCT( name ) \
 NCURSES_IMPEXP chtype NCURSES_API field_ ## name (const FIELD * field)\
 {\
 #define GEN_FIELD_ATTR_GET_FCT( name ) \
 NCURSES_IMPEXP chtype NCURSES_API field_ ## name (const FIELD * field)\
 {\

-   T((T_CALLED("field_" #name "(%p)"), field));\
+   T((T_CALLED("field_" #name "(%p)"), (const void *) field));\

    returnAttr( A_ATTRIBUTES & (Normalize_Field( field ) -> name) );\
 }
 
    returnAttr( A_ATTRIBUTES & (Normalize_Field( field ) -> name) );\
 }
 

diff --git a/form/fld_current.c b/form/fld_current.c
index 7c3a90af511d97a1c0fddacbf6236ad493183ca2..ef9ec007ecaf64894ef1445b963cdce14f2166b5 100644 (file)
--- a/form/fld_current.c
+++ b/form/fld_current.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: fld_current.c,v 1.11 2004/12/25 22:40:13 tom Exp $")
+MODULE_ID("$Id: fld_current.c,v 1.12 2010/01/23 21:14:35 tom Exp $")

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


@@ -52,7 +52,7 @@ set_current_field(FORM *form, FIELD *field)
 {
   int err = E_OK;
 
 {
   int err = E_OK;
 

-  T((T_CALLED("set_current_field(%p,%p)"), form, field));
+  T((T_CALLED("set_current_field(%p,%p)"), (void *)form, (void *)field));

   if (form == 0 || field == 0)
     {
       RETURN(E_BAD_ARGUMENT);
   if (form == 0 || field == 0)
     {
       RETURN(E_BAD_ARGUMENT);


@@ -113,7 +113,7 @@ set_current_field(FORM *form, FIELD *field)
 NCURSES_EXPORT(FIELD *)
 current_field(const FORM *form)
 {
 NCURSES_EXPORT(FIELD *)
 current_field(const FORM *form)
 {

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

   returnField(Normalize_Form(form)->current);
 }
 
   returnField(Normalize_Form(form)->current);
 }
 


@@ -130,7 +130,7 @@ current_field(const FORM *form)
 NCURSES_EXPORT(int)
 field_index(const FIELD *field)
 {
 NCURSES_EXPORT(int)
 field_index(const FIELD *field)
 {

-  T((T_CALLED("field_index(%p)"), field));
+  T((T_CALLED("field_index(%p)"), (const void *)field));

   returnCode((field != 0 && field->form != 0) ? (int)field->index : -1);
 }
 
   returnCode((field != 0 && field->form != 0) ? (int)field->index : -1);
 }
 

diff --git a/form/fld_def.c b/form/fld_def.c
index b8c69d30a4292d8572ed4069b5a1d4274fbc2005..6d7bd34a16cabf3f9a31f8fba6c10eadc34a1f24 100644 (file)
--- a/form/fld_def.c
+++ b/form/fld_def.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2007,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: fld_def.c,v 1.37 2009/02/28 19:00:51 juergen Exp $")
+MODULE_ID("$Id: fld_def.c,v 1.38 2010/01/23 21:14:35 tom Exp $")

 
 /* this can't be readonly */
 static FIELD default_field =
 
 /* this can't be readonly */
 static FIELD default_field =


@@ -291,7 +291,7 @@ new_field(int rows, int cols, int frow, int fcol, int nrow, int nbuf)
       ((err = E_SYSTEM_ERROR) != 0) && /* trick: this resets the default error */
       (New_Field = typeMalloc(FIELD, 1)) != 0)
     {
       ((err = E_SYSTEM_ERROR) != 0) && /* trick: this resets the default error */
       (New_Field = typeMalloc(FIELD, 1)) != 0)
     {

-      T((T_CREATE("field %p"), New_Field));
+      T((T_CREATE("field %p"), (void *)New_Field));

       *New_Field = default_field;
       New_Field->rows = rows;
       New_Field->cols = cols;
       *New_Field = default_field;
       New_Field->rows = rows;
       New_Field->cols = cols;


@@ -355,7 +355,7 @@ new_field(int rows, int cols, int frow, int fcol, int nrow, int nbuf)
 NCURSES_EXPORT(int)
 free_field(FIELD *field)
 {
 NCURSES_EXPORT(int)
 free_field(FIELD *field)
 {

-  T((T_CALLED("free_field(%p)"), field));
+  T((T_CALLED("free_field(%p)"), (void *)field));

   if (!field)
     {
       RETURN(E_BAD_ARGUMENT);
   if (!field)
     {
       RETURN(E_BAD_ARGUMENT);

diff --git a/form/fld_dup.c b/form/fld_dup.c
index bbc38a3eb7156f5bae27a0ce6cfe7d3d41530cec..b8e501b38329ed6a69b5b6b12c5a72ac4f86f49c 100644 (file)
--- a/form/fld_dup.c
+++ b/form/fld_dup.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2004,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2007,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: fld_dup.c,v 1.12 2007/10/13 19:30:21 tom Exp $")
+MODULE_ID("$Id: fld_dup.c,v 1.13 2010/01/23 21:14:35 tom Exp $")

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


@@ -53,12 +53,12 @@ dup_field(FIELD *field, int frow, int fcol)
   FIELD *New_Field = (FIELD *)0;
   int err = E_BAD_ARGUMENT;
 
   FIELD *New_Field = (FIELD *)0;
   int err = E_BAD_ARGUMENT;
 

-  T((T_CALLED("dup_field(%p,%d,%d)"), field, frow, fcol));
+  T((T_CALLED("dup_field(%p,%d,%d)"), (void *)field, frow, fcol));

   if (field && (frow >= 0) && (fcol >= 0) &&
       ((err = E_SYSTEM_ERROR) != 0) && /* trick : this resets the default error */
       (New_Field = typeMalloc(FIELD, 1)))
     {
   if (field && (frow >= 0) && (fcol >= 0) &&
       ((err = E_SYSTEM_ERROR) != 0) && /* trick : this resets the default error */
       (New_Field = typeMalloc(FIELD, 1)))
     {

-      T((T_CREATE("field %p"), New_Field));
+      T((T_CREATE("field %p"), (void *)New_Field));

       *New_Field = *_nc_Default_Field;
       New_Field->frow = frow;
       New_Field->fcol = fcol;
       *New_Field = *_nc_Default_Field;
       New_Field->frow = frow;
       New_Field->fcol = fcol;

diff --git a/form/fld_ftchoice.c b/form/fld_ftchoice.c
index af311caf0cf60057c00d10d81f99489069a78d18..3aac5be2b158d141a515ba851e9fa0cecc470f00 100644 (file)
--- a/form/fld_ftchoice.c
+++ b/form/fld_ftchoice.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: fld_ftchoice.c,v 1.11 2009/11/07 20:22:22 tom Exp $")
+MODULE_ID("$Id: fld_ftchoice.c,v 1.12 2010/01/23 21:14:35 tom Exp $")

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


@@ -51,7 +51,7 @@ set_fieldtype_choice(FIELDTYPE *typ,
                     bool (*const next_choice) (FIELD *, const void *),
                     bool (*const prev_choice) (FIELD *, const void *))
 {
                     bool (*const next_choice) (FIELD *, const void *),
                     bool (*const prev_choice) (FIELD *, const void *))
 {

-  T((T_CALLED("set_fieldtype_choice(%p,%p,%p)"), typ, next_choice, prev_choice));
+  T((T_CALLED("set_fieldtype_choice(%p,%p,%p)"), (void *)typ, next_choice, prev_choice));

 
   if (!typ || !next_choice || !prev_choice)
     RETURN(E_BAD_ARGUMENT);
 
   if (!typ || !next_choice || !prev_choice)
     RETURN(E_BAD_ARGUMENT);

diff --git a/form/fld_ftlink.c b/form/fld_ftlink.c
index 4ed2219262aa4405f0bc9858f81f77e3d47d5690..c2cd251f42a7da79380b632da471c392a1ce23c9 100644 (file)
--- a/form/fld_ftlink.c
+++ b/form/fld_ftlink.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2004,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2007,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: fld_ftlink.c,v 1.13 2007/10/13 19:30:35 tom Exp $")
+MODULE_ID("$Id: fld_ftlink.c,v 1.14 2010/01/23 21:14:35 tom Exp $")

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


@@ -53,14 +53,14 @@ link_fieldtype(FIELDTYPE *type1, FIELDTYPE *type2)
 {
   FIELDTYPE *nftyp = (FIELDTYPE *)0;
 
 {
   FIELDTYPE *nftyp = (FIELDTYPE *)0;
 

-  T((T_CALLED("link_fieldtype(%p,%p)"), type1, type2));
+  T((T_CALLED("link_fieldtype(%p,%p)"), (void *)type1, (void *)type2));

   if (type1 && type2)
     {
       nftyp = typeMalloc(FIELDTYPE, 1);
 
       if (nftyp)
        {
   if (type1 && type2)
     {
       nftyp = typeMalloc(FIELDTYPE, 1);
 
       if (nftyp)
        {

-         T((T_CREATE("fieldtype %p"), nftyp));
+         T((T_CREATE("fieldtype %p"), (void *)nftyp));

          *nftyp = *_nc_Default_FieldType;
          nftyp->status |= _LINKED_TYPE;
          if ((type1->status & _HAS_ARGS) || (type2->status & _HAS_ARGS))
          *nftyp = *_nc_Default_FieldType;
          nftyp->status |= _LINKED_TYPE;
          if ((type1->status & _HAS_ARGS) || (type2->status & _HAS_ARGS))

diff --git a/form/fld_info.c b/form/fld_info.c
index 324198c42bae845e045e65d9b1cae5665a2a4c6a..13fe8e72a03c34ef564b4e3053ec3b83bf533c13 100644 (file)
--- a/form/fld_info.c
+++ b/form/fld_info.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: fld_info.c,v 1.10 2004/12/11 22:24:57 tom Exp $")
+MODULE_ID("$Id: fld_info.c,v 1.11 2010/01/23 21:14:35 tom Exp $")

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


@@ -53,10 +53,10 @@ field_info(const FIELD *field,
           int *nrow, int *nbuf)
 {
   T((T_CALLED("field_info(%p,%p,%p,%p,%p,%p,%p)"),
           int *nrow, int *nbuf)
 {
   T((T_CALLED("field_info(%p,%p,%p,%p,%p,%p,%p)"),

-     field,
-     rows, cols,
-     frow, fcol,
-     nrow, nbuf));
+     (const void *)field,
+     (void *)rows, (void *)cols,
+     (void *)frow, (void *)fcol,
+     (void *)nrow, (void *)nbuf));

 
   if (!field)
     RETURN(E_BAD_ARGUMENT);
 
   if (!field)
     RETURN(E_BAD_ARGUMENT);


@@ -91,7 +91,11 @@ field_info(const FIELD *field,
 NCURSES_EXPORT(int)
 dynamic_field_info(const FIELD *field, int *drows, int *dcols, int *maxgrow)
 {
 NCURSES_EXPORT(int)
 dynamic_field_info(const FIELD *field, int *drows, int *dcols, int *maxgrow)
 {

-  T((T_CALLED("dynamic_field_info(%p,%p,%p,%p)"), field, drows, dcols, maxgrow));
+  T((T_CALLED("dynamic_field_info(%p,%p,%p,%p)"),
+     (const void *)field,
+     (void *)drows,
+     (void *)dcols,
+     (void *)maxgrow));

 
   if (!field)
     RETURN(E_BAD_ARGUMENT);
 
   if (!field)
     RETURN(E_BAD_ARGUMENT);

diff --git a/form/fld_just.c b/form/fld_just.c
index e021fb1cfb926a57847ba05004247ddb6d385695..58a1750cc092b254ab56dd173c5e6e00b89e0192 100644 (file)
--- a/form/fld_just.c
+++ b/form/fld_just.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: fld_just.c,v 1.11 2004/12/11 22:55:48 tom Exp $")
+MODULE_ID("$Id: fld_just.c,v 1.12 2010/01/23 21:14:35 tom Exp $")

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


@@ -49,7 +49,7 @@ set_field_just(FIELD *field, int just)
 {
   int res = E_BAD_ARGUMENT;
 
 {
   int res = E_BAD_ARGUMENT;
 

-  T((T_CALLED("set_field_just(%p,%d)"), field, just));
+  T((T_CALLED("set_field_just(%p,%d)"), (void *)field, just));

 
   if ((just == NO_JUSTIFICATION) ||
       (just == JUSTIFY_LEFT) ||
 
   if ((just == NO_JUSTIFICATION) ||
       (just == JUSTIFY_LEFT) ||


@@ -79,7 +79,7 @@ set_field_just(FIELD *field, int just)
 NCURSES_EXPORT(int)
 field_just(const FIELD *field)
 {
 NCURSES_EXPORT(int)
 field_just(const FIELD *field)
 {

-  T((T_CALLED("field_just(%p)"), field));
+  T((T_CALLED("field_just(%p)"), (const void *)field));

   returnCode(Normalize_Field(field)->just);
 }
 
   returnCode(Normalize_Field(field)->just);
 }
 

diff --git a/form/fld_link.c b/form/fld_link.c
index 0aac7db78d12317e33c452a4e7a7771a8584ee29..18103bee19105dbc67ac950950c17b579de29dae 100644 (file)
--- a/form/fld_link.c
+++ b/form/fld_link.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2004,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2007,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: fld_link.c,v 1.11 2007/10/13 19:30:43 tom Exp $")
+MODULE_ID("$Id: fld_link.c,v 1.12 2010/01/23 21:14:35 tom Exp $")

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


@@ -54,12 +54,12 @@ link_field(FIELD *field, int frow, int fcol)
   FIELD *New_Field = (FIELD *)0;
   int err = E_BAD_ARGUMENT;
 
   FIELD *New_Field = (FIELD *)0;
   int err = E_BAD_ARGUMENT;
 

-  T((T_CALLED("link_field(%p,%d,%d)"), field, frow, fcol));
+  T((T_CALLED("link_field(%p,%d,%d)"), (void *)field, frow, fcol));

   if (field && (frow >= 0) && (fcol >= 0) &&
       ((err = E_SYSTEM_ERROR) != 0) && /* trick: this resets the default error */
       (New_Field = typeMalloc(FIELD, 1)))
     {
   if (field && (frow >= 0) && (fcol >= 0) &&
       ((err = E_SYSTEM_ERROR) != 0) && /* trick: this resets the default error */
       (New_Field = typeMalloc(FIELD, 1)))
     {

-      T((T_CREATE("field %p"), New_Field));
+      T((T_CREATE("field %p"), (void *)New_Field));

       *New_Field = *_nc_Default_Field;
       New_Field->frow = frow;
       New_Field->fcol = fcol;
       *New_Field = *_nc_Default_Field;
       New_Field->frow = frow;
       New_Field->fcol = fcol;

diff --git a/form/fld_max.c b/form/fld_max.c
index 7f5352e00d6e5fd6f8bc723e69ecdf130335df9f..5ce918e4e0798484801c7a5beca0bd717838a07a 100644 (file)
--- a/form/fld_max.c
+++ b/form/fld_max.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: fld_max.c,v 1.9 2004/12/11 21:51:54 tom Exp $")
+MODULE_ID("$Id: fld_max.c,v 1.10 2010/01/23 21:14:36 tom Exp $")

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


@@ -47,7 +47,7 @@ MODULE_ID("$Id: fld_max.c,v 1.9 2004/12/11 21:51:54 tom Exp $")
 NCURSES_EXPORT(int)
 set_max_field(FIELD *field, int maxgrow)
 {
 NCURSES_EXPORT(int)
 set_max_field(FIELD *field, int maxgrow)
 {

-  T((T_CALLED("set_max_field(%p,%d)"), field, maxgrow));
+  T((T_CALLED("set_max_field(%p,%d)"), (void *)field, maxgrow));

 
   if (!field || (maxgrow < 0))
     RETURN(E_BAD_ARGUMENT);
 
   if (!field || (maxgrow < 0))
     RETURN(E_BAD_ARGUMENT);

diff --git a/form/fld_move.c b/form/fld_move.c
index d9ceaaec2c9cb55d2a3ddd0e2f90102a756e54c5..dfba22d72aaaccd9f5964f01e47ca833f64c5119 100644 (file)
--- a/form/fld_move.c
+++ b/form/fld_move.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: fld_move.c,v 1.9 2004/12/11 21:52:44 tom Exp $")
+MODULE_ID("$Id: fld_move.c,v 1.10 2010/01/23 21:14:36 tom Exp $")

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


@@ -48,7 +48,7 @@ MODULE_ID("$Id: fld_move.c,v 1.9 2004/12/11 21:52:44 tom Exp $")
 NCURSES_EXPORT(int)
 move_field(FIELD *field, int frow, int fcol)
 {
 NCURSES_EXPORT(int)
 move_field(FIELD *field, int frow, int fcol)
 {

-  T((T_CALLED("move_field(%p,%d,%d)"), field, frow, fcol));
+  T((T_CALLED("move_field(%p,%d,%d)"), (void *)field, frow, fcol));

 
   if (!field || (frow < 0) || (fcol < 0))
     RETURN(E_BAD_ARGUMENT);
 
   if (!field || (frow < 0) || (fcol < 0))
     RETURN(E_BAD_ARGUMENT);

diff --git a/form/fld_newftyp.c b/form/fld_newftyp.c
index 689eda454fec64460c6063945328557d88a6e0fd..4351aed6b3c8ca4e354ec54c372a9fc2a43ad475 100644 (file)
--- a/form/fld_newftyp.c
+++ b/form/fld_newftyp.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: fld_newftyp.c,v 1.18 2009/11/07 20:18:30 tom Exp $")
+MODULE_ID("$Id: fld_newftyp.c,v 1.19 2010/01/23 21:14:36 tom Exp $")

 
 static FIELDTYPE default_fieldtype =
 {
 
 static FIELDTYPE default_fieldtype =
 {


@@ -83,7 +83,7 @@ new_fieldtype(bool (*const field_check) (FIELD *, const void *),
 
       if (nftyp)
        {
 
       if (nftyp)
        {

-         T((T_CREATE("fieldtype %p"), nftyp));
+         T((T_CREATE("fieldtype %p"), (void *)nftyp));

          *nftyp = default_fieldtype;
 #if NCURSES_INTEROP_FUNCS
          nftyp->fieldcheck.ofcheck = field_check;
          *nftyp = default_fieldtype;
 #if NCURSES_INTEROP_FUNCS
          nftyp->fieldcheck.ofcheck = field_check;


@@ -118,7 +118,7 @@ new_fieldtype(bool (*const field_check) (FIELD *, const void *),
 NCURSES_EXPORT(int)
 free_fieldtype(FIELDTYPE *typ)
 {
 NCURSES_EXPORT(int)
 free_fieldtype(FIELDTYPE *typ)
 {

-  T((T_CALLED("free_fieldtype(%p)"), typ));
+  T((T_CALLED("free_fieldtype(%p)"), (void *)typ));

 
   if (!typ)
     RETURN(E_BAD_ARGUMENT);
 
   if (!typ)
     RETURN(E_BAD_ARGUMENT);

diff --git a/form/fld_opts.c b/form/fld_opts.c
index 3c881acf081acbc4d728baf6804a9c28af4f98eb..a52f1e2ad88f17144c68034ccdd707d5b3f0411f 100644 (file)
--- a/form/fld_opts.c
+++ b/form/fld_opts.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: fld_opts.c,v 1.11 2004/12/11 21:55:46 tom Exp $")
+MODULE_ID("$Id: fld_opts.c,v 1.12 2010/01/23 21:14:36 tom Exp $")

 
 /*----------------------------------------------------------------------------
   Field-Options manipulation routines
 
 /*----------------------------------------------------------------------------
   Field-Options manipulation routines


@@ -55,7 +55,7 @@ set_field_opts(FIELD *field, Field_Options opts)
 {
   int res = E_BAD_ARGUMENT;
 
 {
   int res = E_BAD_ARGUMENT;
 

-  T((T_CALLED("set_field_opts(%p,%d)"), field, opts));
+  T((T_CALLED("set_field_opts(%p,%d)"), (void *)field, opts));

 
   opts &= ALL_FIELD_OPTS;
   if (!(opts & ~ALL_FIELD_OPTS))
 
   opts &= ALL_FIELD_OPTS;
   if (!(opts & ~ALL_FIELD_OPTS))


@@ -74,7 +74,7 @@ set_field_opts(FIELD *field, Field_Options opts)
 NCURSES_EXPORT(Field_Options)
 field_opts(const FIELD *field)
 {
 NCURSES_EXPORT(Field_Options)
 field_opts(const FIELD *field)
 {

-  T((T_CALLED("field_opts(%p)"), field));
+  T((T_CALLED("field_opts(%p)"), (const void *)field));

 
   returnCode(ALL_FIELD_OPTS & Normalize_Field(field)->opts);
 }
 
   returnCode(ALL_FIELD_OPTS & Normalize_Field(field)->opts);
 }


@@ -96,7 +96,7 @@ field_opts_on(FIELD *field, Field_Options opts)
 {
   int res = E_BAD_ARGUMENT;
 
 {
   int res = E_BAD_ARGUMENT;
 

-  T((T_CALLED("field_opts_on(%p,%d)"), field, opts));
+  T((T_CALLED("field_opts_on(%p,%d)"), (void *)field, opts));

 
   opts &= ALL_FIELD_OPTS;
   if (!(opts & ~ALL_FIELD_OPTS))
 
   opts &= ALL_FIELD_OPTS;
   if (!(opts & ~ALL_FIELD_OPTS))


@@ -124,7 +124,7 @@ field_opts_off(FIELD *field, Field_Options opts)
 {
   int res = E_BAD_ARGUMENT;
 
 {
   int res = E_BAD_ARGUMENT;
 

-  T((T_CALLED("field_opts_off(%p,%d)"), field, opts));
+  T((T_CALLED("field_opts_off(%p,%d)"), (void *)field, opts));

 
   opts &= ALL_FIELD_OPTS;
   if (!(opts & ~ALL_FIELD_OPTS))
 
   opts &= ALL_FIELD_OPTS;
   if (!(opts & ~ALL_FIELD_OPTS))

diff --git a/form/fld_pad.c b/form/fld_pad.c
index 63d8ad1cdbfa4646ab174cac2375a03b7d9f1216..4f8ff1f54f0469618253415c04ad4972d7c5a95d 100644 (file)
--- a/form/fld_pad.c
+++ b/form/fld_pad.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: fld_pad.c,v 1.9 2004/12/11 21:56:49 tom Exp $")
+MODULE_ID("$Id: fld_pad.c,v 1.10 2010/01/23 21:14:36 tom Exp $")

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


@@ -50,7 +50,7 @@ set_field_pad(FIELD *field, int ch)
 {
   int res = E_BAD_ARGUMENT;
 
 {
   int res = E_BAD_ARGUMENT;
 

-  T((T_CALLED("set_field_pad(%p,%d)"), field, ch));
+  T((T_CALLED("set_field_pad(%p,%d)"), (void *)field, ch));

 
   Normalize_Field(field);
   if (isprint(UChar(ch)))
 
   Normalize_Field(field);
   if (isprint(UChar(ch)))


@@ -77,7 +77,7 @@ set_field_pad(FIELD *field, int ch)
 NCURSES_EXPORT(int)
 field_pad(const FIELD *field)
 {
 NCURSES_EXPORT(int)
 field_pad(const FIELD *field)
 {

-  T((T_CALLED("field_pad(%p)"), field));
+  T((T_CALLED("field_pad(%p)"), (const void *)field));

 
   returnCode(Normalize_Field(field)->pad);
 }
 
   returnCode(Normalize_Field(field)->pad);
 }

diff --git a/form/fld_page.c b/form/fld_page.c
index e1af4962b1483522599907ff79a70042d717c9db..e4d18c556be610485df81fcc57491910a84b5b9d 100644 (file)
--- a/form/fld_page.c
+++ b/form/fld_page.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: fld_page.c,v 1.9 2004/12/11 21:58:19 tom Exp $")
+MODULE_ID("$Id: fld_page.c,v 1.10 2010/01/23 21:14:36 tom Exp $")

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


@@ -47,7 +47,7 @@ MODULE_ID("$Id: fld_page.c,v 1.9 2004/12/11 21:58:19 tom Exp $")
 NCURSES_EXPORT(int)
 set_new_page(FIELD *field, bool new_page_flag)
 {
 NCURSES_EXPORT(int)
 set_new_page(FIELD *field, bool new_page_flag)
 {

-  T((T_CALLED("set_new_page(%p,%d)"), field, new_page_flag));
+  T((T_CALLED("set_new_page(%p,%d)"), (void *)field, new_page_flag));

 
   Normalize_Field(field);
   if (field->form)
 
   Normalize_Field(field);
   if (field->form)


@@ -74,7 +74,7 @@ set_new_page(FIELD *field, bool new_page_flag)
 NCURSES_EXPORT(bool)
 new_page(const FIELD *field)
 {
 NCURSES_EXPORT(bool)
 new_page(const FIELD *field)
 {

-  T((T_CALLED("new_page(%p)"), field));
+  T((T_CALLED("new_page(%p)"), (const void *)field));

 
   returnBool((Normalize_Field(field)->status & _NEWPAGE) ? TRUE : FALSE);
 }
 
   returnBool((Normalize_Field(field)->status & _NEWPAGE) ? TRUE : FALSE);
 }

diff --git a/form/fld_stat.c b/form/fld_stat.c
index b85b4d55f244e08814fe4cd98a7dba43878d8736..46f89e674836e7ce83de568fb5fcdb48ed3046b2 100644 (file)
--- a/form/fld_stat.c
+++ b/form/fld_stat.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: fld_stat.c,v 1.11 2004/12/11 22:28:00 tom Exp $")
+MODULE_ID("$Id: fld_stat.c,v 1.12 2010/01/23 21:14:36 tom Exp $")

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


@@ -46,7 +46,7 @@ MODULE_ID("$Id: fld_stat.c,v 1.11 2004/12/11 22:28:00 tom Exp $")
 NCURSES_EXPORT(int)
 set_field_status(FIELD *field, bool status)
 {
 NCURSES_EXPORT(int)
 set_field_status(FIELD *field, bool status)
 {

-  T((T_CALLED("set_field_status(%p,%d)"), field, status));
+  T((T_CALLED("set_field_status(%p,%d)"), (void *)field, status));

 
   Normalize_Field(field);
 
 
   Normalize_Field(field);
 


@@ -71,7 +71,7 @@ set_field_status(FIELD *field, bool status)
 NCURSES_EXPORT(bool)
 field_status(const FIELD *field)
 {
 NCURSES_EXPORT(bool)
 field_status(const FIELD *field)
 {

-  T((T_CALLED("field_status(%p)"), field));
+  T((T_CALLED("field_status(%p)"), (const void *)field));

 
   returnBool((Normalize_Field(field)->status & _CHANGED) ? TRUE : FALSE);
 }
 
   returnBool((Normalize_Field(field)->status & _CHANGED) ? TRUE : FALSE);
 }

diff --git a/form/fld_type.c b/form/fld_type.c
index c9a3fbe5c8048d599d071ea19abae0eff2828384..0b35b7eb9e5641f8e60f57dbabf55c57b735a7d0 100644 (file)
--- a/form/fld_type.c
+++ b/form/fld_type.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: fld_type.c,v 1.15 2004/12/25 22:24:10 tom Exp $")
+MODULE_ID("$Id: fld_type.c,v 1.16 2010/01/23 21:14:36 tom Exp $")

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


@@ -52,7 +52,7 @@ set_field_type(FIELD *field, FIELDTYPE *type,...)
   int res = E_SYSTEM_ERROR;
   int err = 0;
 
   int res = E_SYSTEM_ERROR;
   int err = 0;
 

-  T((T_CALLED("set_field_type(%p,%p)"), field, type));
+  T((T_CALLED("set_field_type(%p,%p)"), (void *)field, (void *)type));

 
   va_start(ap, type);
 
 
   va_start(ap, type);
 


@@ -90,7 +90,7 @@ set_field_type(FIELD *field, FIELDTYPE *type,...)
 NCURSES_EXPORT(FIELDTYPE *)
 field_type(const FIELD *field)
 {
 NCURSES_EXPORT(FIELDTYPE *)
 field_type(const FIELD *field)
 {

-  T((T_CALLED("field_type(%p)"), field));
+  T((T_CALLED("field_type(%p)"), (const void *)field));

   returnFieldType(Normalize_Field(field)->type);
 }
 
   returnFieldType(Normalize_Field(field)->type);
 }
 

diff --git a/form/fld_user.c b/form/fld_user.c
index 323622c7b3797b2dbbe7a8b6d949100fdffea276..30bcf7a415d4d7c3796099b9a53594aab7849199 100644 (file)
--- a/form/fld_user.c
+++ b/form/fld_user.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: fld_user.c,v 1.15 2004/12/25 22:24:50 tom Exp $")
+MODULE_ID("$Id: fld_user.c,v 1.16 2010/01/23 21:14:36 tom Exp $")

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


@@ -46,7 +46,7 @@ MODULE_ID("$Id: fld_user.c,v 1.15 2004/12/25 22:24:50 tom Exp $")
 NCURSES_EXPORT(int)
 set_field_userptr(FIELD *field, void *usrptr)
 {
 NCURSES_EXPORT(int)
 set_field_userptr(FIELD *field, void *usrptr)
 {

-  T((T_CALLED("set_field_userptr(%p,%p)"), field, usrptr));
+  T((T_CALLED("set_field_userptr(%p,%p)"), (void *)field, (void *)usrptr));

 
   Normalize_Field(field)->usrptr = usrptr;
   RETURN(E_OK);
 
   Normalize_Field(field)->usrptr = usrptr;
   RETURN(E_OK);


@@ -65,7 +65,7 @@ set_field_userptr(FIELD *field, void *usrptr)
 NCURSES_EXPORT(void *)
 field_userptr(const FIELD *field)
 {
 NCURSES_EXPORT(void *)
 field_userptr(const FIELD *field)
 {

-  T((T_CALLED("field_userptr(%p)"), field));
+  T((T_CALLED("field_userptr(%p)"), (const void *)field));

   returnVoidPtr(Normalize_Field(field)->usrptr);
 }
 
   returnVoidPtr(Normalize_Field(field)->usrptr);
 }
 

diff --git a/form/frm_cursor.c b/form/frm_cursor.c
index 18dabab2088907ff7564c896ef7f25f11897a859..7a4cd16116fc27a01233eea69054cbf18c91784d 100644 (file)
--- a/form/frm_cursor.c
+++ b/form/frm_cursor.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: frm_cursor.c,v 1.9 2004/12/11 22:01:03 tom Exp $")
+MODULE_ID("$Id: frm_cursor.c,v 1.10 2010/01/23 21:14:36 tom Exp $")

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


@@ -53,7 +53,7 @@ pos_form_cursor(FORM *form)
 {
   int res;
 
 {
   int res;
 

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

 
   if (!form)
     res = E_BAD_ARGUMENT;
 
   if (!form)
     res = E_BAD_ARGUMENT;

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

- * Copyright (c) 1998-2004,2005 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.14 2005/11/26 15:34:01 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)
     {


@@ -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)
     {

diff --git a/form/frm_def.c b/form/frm_def.c
index 88964fc8f774e94364269b53cafc632575333b4b..86500f239863f125c81c5178ac3c0896fd3d86ac 100644 (file)
--- a/form/frm_def.c
+++ b/form/frm_def.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: frm_def.c,v 1.24 2009/11/07 16:59:03 tom Exp $")
+MODULE_ID("$Id: frm_def.c,v 1.25 2010/01/23 21:14:36 tom Exp $")

 
 /* this can't be readonly */
 static FORM default_form =
 
 /* this can't be readonly */
 static FORM default_form =


@@ -160,7 +160,7 @@ Connect_Fields(FORM *form, FIELD **fields)
   int maximum_row_in_field, maximum_col_in_field;
   _PAGE *pg;
 
   int maximum_row_in_field, maximum_col_in_field;
   _PAGE *pg;
 

-  T((T_CALLED("Connect_Fields(%p,%p)"), form, fields));
+  T((T_CALLED("Connect_Fields(%p,%p)"), (void *)form, (void *)fields));

 
   assert(form);
 
 
   assert(form);
 


@@ -188,7 +188,7 @@ Connect_Fields(FORM *form, FIELD **fields)
   /* allocate page structures */
   if ((pg = typeMalloc(_PAGE, page_nr)) != (_PAGE *) 0)
     {
   /* allocate page structures */
   if ((pg = typeMalloc(_PAGE, page_nr)) != (_PAGE *) 0)
     {

-      T((T_CREATE("_PAGE %p"), pg));
+      T((T_CREATE("_PAGE %p"), (void *)pg));

       form->page = pg;
     }
   else
       form->page = pg;
     }
   else


@@ -300,7 +300,7 @@ NCURSES_SP_NAME(new_form) (NCURSES_SP_DCLx FIELD **fields)
   int err = E_SYSTEM_ERROR;
   FORM *form = (FORM *)0;
 
   int err = E_SYSTEM_ERROR;
   FORM *form = (FORM *)0;
 

-  T((T_CALLED("new_form(%p,%p)"), SP_PARM, fields));
+  T((T_CALLED("new_form(%p,%p)"), (void *)SP_PARM, (void *)fields));

 
   if (IsValidScreen(SP_PARM))
     {
 
   if (IsValidScreen(SP_PARM))
     {


@@ -308,7 +308,7 @@ NCURSES_SP_NAME(new_form) (NCURSES_SP_DCLx FIELD **fields)
 
       if (form)
        {
 
       if (form)
        {

-         T((T_CREATE("form %p"), form));
+         T((T_CREATE("form %p"), (void *)form));

          *form = *_nc_Default_Form;
          /* This ensures win and sub are always non-null,
             so we can derive always the SCREEN that this form is
          *form = *_nc_Default_Form;
          /* This ensures win and sub are always non-null,
             so we can derive always the SCREEN that this form is


@@ -363,7 +363,7 @@ new_form(FIELD **fields)
 NCURSES_EXPORT(int)
 free_form(FORM *form)
 {
 NCURSES_EXPORT(int)
 free_form(FORM *form)
 {

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

 
   if (!form)
     RETURN(E_BAD_ARGUMENT);
 
   if (!form)
     RETURN(E_BAD_ARGUMENT);


@@ -397,7 +397,7 @@ set_form_fields(FORM *form, FIELD **fields)
   FIELD **old;
   int res;
 
   FIELD **old;
   int res;
 

-  T((T_CALLED("set_form_fields(%p,%p)"), form, fields));
+  T((T_CALLED("set_form_fields(%p,%p)"), (void *)form, (void *)fields));

 
   if (!form)
     RETURN(E_BAD_ARGUMENT);
 
   if (!form)
     RETURN(E_BAD_ARGUMENT);


@@ -425,7 +425,7 @@ set_form_fields(FORM *form, FIELD **fields)
 NCURSES_EXPORT(FIELD **)
 form_fields(const FORM *form)
 {
 NCURSES_EXPORT(FIELD **)
 form_fields(const FORM *form)
 {

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

   returnFieldPtr(Normalize_Form(form)->field);
 }
 
   returnFieldPtr(Normalize_Form(form)->field);
 }
 


@@ -440,7 +440,7 @@ form_fields(const FORM *form)
 NCURSES_EXPORT(int)
 field_count(const FORM *form)
 {
 NCURSES_EXPORT(int)
 field_count(const FORM *form)
 {

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

 
   returnCode(Normalize_Form(form)->maxfield);
 }
 
   returnCode(Normalize_Form(form)->maxfield);
 }

diff --git a/form/frm_hook.c b/form/frm_hook.c
index 18e6d71f31ab36ea495f15a575b867b44dff8d8f..7daa396b704a619856605451d81003f916289736 100644 (file)
--- a/form/frm_hook.c
+++ b/form/frm_hook.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: frm_hook.c,v 1.14 2004/12/25 22:37:27 tom Exp $")
+MODULE_ID("$Id: frm_hook.c,v 1.15 2010/01/23 21:12:08 tom Exp $")

 
 /* "Template" macro to generate function to set application specific hook */
 #define GEN_HOOK_SET_FUNCTION( typ, name ) \
 
 /* "Template" macro to generate function to set application specific hook */
 #define GEN_HOOK_SET_FUNCTION( typ, name ) \


@@ -47,7 +47,7 @@ NCURSES_IMPEXP int NCURSES_API set_ ## typ ## _ ## name (FORM *form, Form_Hook f
 #define GEN_HOOK_GET_FUNCTION( typ, name ) \
 NCURSES_IMPEXP Form_Hook NCURSES_API typ ## _ ## name ( const FORM *form )\
 {\
 #define GEN_HOOK_GET_FUNCTION( typ, name ) \
 NCURSES_IMPEXP Form_Hook NCURSES_API typ ## _ ## name ( const FORM *form )\
 {\

-   T((T_CALLED(#typ "_" #name "(%p)"), form));\
+   T((T_CALLED(#typ "_" #name "(%p)"), (const void *) form));\

    returnFormHook( Normalize_Form( form ) -> typ ## name );\
 }
 
    returnFormHook( Normalize_Form( form ) -> typ ## name );\
 }
 

diff --git a/form/frm_opts.c b/form/frm_opts.c
index d36d618a5343c0ab8783bd077ad801e07c7d11d4..3557fcd7ff0430d0f643e209b8cf3ff87b9a83af 100644 (file)
--- a/form/frm_opts.c
+++ b/form/frm_opts.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2004,2005 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_opts.c,v 1.14 2005/04/16 16:59:18 tom Exp $")
+MODULE_ID("$Id: frm_opts.c,v 1.15 2010/01/23 21:14:36 tom Exp $")

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


@@ -47,7 +47,7 @@ MODULE_ID("$Id: frm_opts.c,v 1.14 2005/04/16 16:59:18 tom Exp $")
 NCURSES_EXPORT(int)
 set_form_opts(FORM *form, Form_Options opts)
 {
 NCURSES_EXPORT(int)
 set_form_opts(FORM *form, Form_Options opts)
 {

-  T((T_CALLED("set_form_opts(%p,%d)"), form, opts));
+  T((T_CALLED("set_form_opts(%p,%d)"), (void *)form, opts));

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


@@ -70,7 +70,7 @@ set_form_opts(FORM *form, Form_Options opts)
 NCURSES_EXPORT(Form_Options)
 form_opts(const FORM *form)
 {
 NCURSES_EXPORT(Form_Options)
 form_opts(const FORM *form)
 {

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

   returnCode((int)(Normalize_Form(form)->opts & ALL_FORM_OPTS));
 }
 
   returnCode((int)(Normalize_Form(form)->opts & ALL_FORM_OPTS));
 }
 


@@ -87,7 +87,7 @@ form_opts(const FORM *form)
 NCURSES_EXPORT(int)
 form_opts_on(FORM *form, Form_Options opts)
 {
 NCURSES_EXPORT(int)
 form_opts_on(FORM *form, Form_Options opts)
 {

-  T((T_CALLED("form_opts_on(%p,%d)"), form, opts));
+  T((T_CALLED("form_opts_on(%p,%d)"), (void *)form, opts));

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


@@ -112,7 +112,7 @@ form_opts_on(FORM *form, Form_Options opts)
 NCURSES_EXPORT(int)
 form_opts_off(FORM *form, Form_Options opts)
 {
 NCURSES_EXPORT(int)
 form_opts_off(FORM *form, Form_Options opts)
 {

-  T((T_CALLED("form_opts_off(%p,%d)"), form, opts));
+  T((T_CALLED("form_opts_off(%p,%d)"), (void *)form, opts));

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

diff --git a/form/frm_page.c b/form/frm_page.c
index a371838d950ed882d83650db901df93178c806c0..5a76ca99579363a881753e36010af9ef6695e14f 100644 (file)
--- a/form/frm_page.c
+++ b/form/frm_page.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: frm_page.c,v 1.10 2004/12/11 22:08:21 tom Exp $")
+MODULE_ID("$Id: frm_page.c,v 1.11 2010/01/23 21:14:36 tom Exp $")

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


@@ -51,7 +51,7 @@ set_form_page(FORM *form, int page)
 {
   int err = E_OK;
 
 {
   int err = E_OK;
 

-  T((T_CALLED("set_form_page(%p,%d)"), form, page));
+  T((T_CALLED("set_form_page(%p,%d)"), (void *)form, page));

 
   if (!form || (page < 0) || (page >= form->maxpage))
     RETURN(E_BAD_ARGUMENT);
 
   if (!form || (page < 0) || (page >= form->maxpage))
     RETURN(E_BAD_ARGUMENT);


@@ -98,7 +98,7 @@ set_form_page(FORM *form, int page)
 NCURSES_EXPORT(int)
 form_page(const FORM *form)
 {
 NCURSES_EXPORT(int)
 form_page(const FORM *form)
 {

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

 
   returnCode(Normalize_Form(form)->curpage);
 }
 
   returnCode(Normalize_Form(form)->curpage);
 }

diff --git a/form/frm_post.c b/form/frm_post.c
index 28937e91b0b29b3da389d81078009bba1fdd8f55..8e29aff5f62a721eb453aab4221d0defed20a2bf 100644 (file)
--- a/form/frm_post.c
+++ b/form/frm_post.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: frm_post.c,v 1.9 2004/12/11 22:19:06 tom Exp $")
+MODULE_ID("$Id: frm_post.c,v 1.10 2010/01/23 21:14:36 tom Exp $")

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


@@ -54,7 +54,7 @@ post_form(FORM *form)
   int err;
   int page;
 
   int err;
   int page;
 

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

 
   if (!form)
     RETURN(E_BAD_ARGUMENT);
 
   if (!form)
     RETURN(E_BAD_ARGUMENT);


@@ -100,7 +100,7 @@ post_form(FORM *form)
 NCURSES_EXPORT(int)
 unpost_form(FORM *form)
 {
 NCURSES_EXPORT(int)
 unpost_form(FORM *form)
 {

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

 
   if (!form)
     RETURN(E_BAD_ARGUMENT);
 
   if (!form)
     RETURN(E_BAD_ARGUMENT);

diff --git a/form/frm_scale.c b/form/frm_scale.c
index 2ebf72d06c675faf6a956a890a5c8a67109342e6..27e154e243ee1f060e538d023c915ab78fc39bba 100644 (file)
--- a/form/frm_scale.c
+++ b/form/frm_scale.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: frm_scale.c,v 1.9 2004/12/11 22:12:34 tom Exp $")
+MODULE_ID("$Id: frm_scale.c,v 1.10 2010/01/23 21:14:36 tom Exp $")

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


@@ -47,7 +47,10 @@ MODULE_ID("$Id: frm_scale.c,v 1.9 2004/12/11 22:12:34 tom Exp $")
 NCURSES_EXPORT(int)
 scale_form(const FORM *form, int *rows, int *cols)
 {
 NCURSES_EXPORT(int)
 scale_form(const FORM *form, int *rows, int *cols)
 {

-  T((T_CALLED("scale_form(%p,%p,%p)"), form, rows, cols));
+  T((T_CALLED("scale_form(%p,%p,%p)"),
+     (const void *)form,
+     (void *)rows,
+     (void *)cols));

 
   if (!form)
     RETURN(E_BAD_ARGUMENT);
 
   if (!form)
     RETURN(E_BAD_ARGUMENT);

diff --git a/form/frm_sub.c b/form/frm_sub.c
index 3297887eac57a5e682912be5e5b0cceb8a427efa..1ab131a593c839befadd48062c3121a772053bd8 100644 (file)
--- a/form/frm_sub.c
+++ b/form/frm_sub.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: frm_sub.c,v 1.11 2009/11/07 17:10:41 tom Exp $")
+MODULE_ID("$Id: frm_sub.c,v 1.12 2010/01/23 21:14:36 tom Exp $")

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


@@ -46,7 +46,7 @@ MODULE_ID("$Id: frm_sub.c,v 1.11 2009/11/07 17:10:41 tom Exp $")
 NCURSES_EXPORT(int)
 set_form_sub(FORM *form, WINDOW *win)
 {
 NCURSES_EXPORT(int)
 set_form_sub(FORM *form, WINDOW *win)
 {

-  T((T_CALLED("set_form_sub(%p,%p)"), form, win));
+  T((T_CALLED("set_form_sub(%p,%p)"), (void *)form, (void *)win));

 
   if (form && (form->status & _POSTED))
     RETURN(E_POSTED);
 
   if (form && (form->status & _POSTED))
     RETURN(E_POSTED);


@@ -77,7 +77,7 @@ form_sub(const FORM *form)
 {
   const FORM *f;
 
 {
   const FORM *f;
 

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

 
   f = Normalize_Form(form);
   returnWin(Get_Form_Window(f));
 
   f = Normalize_Form(form);
   returnWin(Get_Form_Window(f));

diff --git a/form/frm_user.c b/form/frm_user.c
index 4d5e0e463a43fa43a0113f99e5edd2c7169fe87e..1375b5e90af6ec146eca91f35188a6b5f59e824b 100644 (file)
--- a/form/frm_user.c
+++ b/form/frm_user.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: frm_user.c,v 1.14 2004/12/25 22:37:56 tom Exp $")
+MODULE_ID("$Id: frm_user.c,v 1.15 2010/01/23 21:14:36 tom Exp $")

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


@@ -46,7 +46,7 @@ MODULE_ID("$Id: frm_user.c,v 1.14 2004/12/25 22:37:56 tom Exp $")
 NCURSES_EXPORT(int)
 set_form_userptr(FORM *form, void *usrptr)
 {
 NCURSES_EXPORT(int)
 set_form_userptr(FORM *form, void *usrptr)
 {

-  T((T_CALLED("set_form_userptr(%p,%p)"), form, usrptr));
+  T((T_CALLED("set_form_userptr(%p,%p)"), (void *)form, (void *)usrptr));

 
   Normalize_Form(form)->usrptr = usrptr;
   RETURN(E_OK);
 
   Normalize_Form(form)->usrptr = usrptr;
   RETURN(E_OK);


@@ -65,7 +65,7 @@ set_form_userptr(FORM *form, void *usrptr)
 NCURSES_EXPORT(void *)
 form_userptr(const FORM *form)
 {
 NCURSES_EXPORT(void *)
 form_userptr(const FORM *form)
 {

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

   returnVoidPtr(Normalize_Form(form)->usrptr);
 }
 
   returnVoidPtr(Normalize_Form(form)->usrptr);
 }
 

diff --git a/form/frm_win.c b/form/frm_win.c
index ae9fb153c3b7c777b546c61ee8380283d504731b..a65cc59f843d7f49faab397443811d2aaa14f6cf 100644 (file)
--- a/form/frm_win.c
+++ b/form/frm_win.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: frm_win.c,v 1.15 2009/11/07 17:11:21 tom Exp $")
+MODULE_ID("$Id: frm_win.c,v 1.16 2010/01/23 21:14:36 tom Exp $")

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


@@ -46,7 +46,7 @@ MODULE_ID("$Id: frm_win.c,v 1.15 2009/11/07 17:11:21 tom Exp $")
 NCURSES_EXPORT(int)
 set_form_win(FORM *form, WINDOW *win)
 {
 NCURSES_EXPORT(int)
 set_form_win(FORM *form, WINDOW *win)
 {

-  T((T_CALLED("set_form_win(%p,%p)"), form, win));
+  T((T_CALLED("set_form_win(%p,%p)"), (void *)form, (void *)win));

 
   if (form && (form->status & _POSTED))
     RETURN(E_POSTED);
 
   if (form && (form->status & _POSTED))
     RETURN(E_POSTED);


@@ -78,7 +78,7 @@ form_win(const FORM *form)
   WINDOW *result;
   const FORM *f;
 
   WINDOW *result;
   const FORM *f;
 

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

 
   f = Normalize_Form(form);
 #if NCURSES_SP_FUNCS
 
   f = Normalize_Form(form);
 #if NCURSES_SP_FUNCS

diff --git a/form/fty_alnum.c b/form/fty_alnum.c
index c5e05ff6dfcddb605b4bc4e0a0468305cd004064..cda23dc2b653d3d44abe00e20ecd56ac88ce6782 100644 (file)
--- a/form/fty_alnum.c
+++ b/form/fty_alnum.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: fty_alnum.c,v 1.23 2009/11/07 20:17:58 tom Exp $")
+MODULE_ID("$Id: fty_alnum.c,v 1.24 2010/01/23 21:14:36 tom Exp $")

 
 #define thisARG alnumARG
 
 
 #define thisARG alnumARG
 


@@ -63,7 +63,7 @@ Generic_This_Type(void *arg)
 
       if (argp)
        {
 
       if (argp)
        {

-         T((T_CREATE("thisARG %p"), argp));
+         T((T_CREATE("thisARG %p"), (void *)argp));

          argp->width = *((int *)arg);
        }
     }
          argp->width = *((int *)arg);
        }
     }


@@ -102,7 +102,7 @@ Copy_This_Type(const void *argp)
 
   if (result)
     {
 
   if (result)
     {

-      T((T_CREATE("thisARG %p"), result));
+      T((T_CREATE("thisARG %p"), (void *)result));

       *result = *ap;
     }
 
       *result = *ap;
     }
 

diff --git a/form/fty_alpha.c b/form/fty_alpha.c
index a50374d12a69c1b6c9e09b630fd98a67d0ca1b9f..917a9e0ea0a402519df1693bf745338a971b176d 100644 (file)
--- a/form/fty_alpha.c
+++ b/form/fty_alpha.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: fty_alpha.c,v 1.25 2009/11/07 20:17:58 tom Exp $")
+MODULE_ID("$Id: fty_alpha.c,v 1.26 2010/01/23 21:14:36 tom Exp $")

 
 #define thisARG alphaARG
 
 
 #define thisARG alphaARG
 


@@ -63,7 +63,7 @@ Generic_This_Type(void *arg)
 
       if (argp)
        {
 
       if (argp)
        {

-         T((T_CREATE("thisARG %p"), argp));
+         T((T_CREATE("thisARG %p"), (void *)argp));

          argp->width = *((int *)arg);
        }
     }
          argp->width = *((int *)arg);
        }
     }


@@ -102,7 +102,7 @@ Copy_This_Type(const void *argp)
 
   if (result)
     {
 
   if (result)
     {

-      T((T_CREATE("thisARG %p"), result));
+      T((T_CREATE("thisARG %p"), (void *)result));

       *result = *ap;
     }
 
       *result = *ap;
     }
 

diff --git a/form/fty_enum.c b/form/fty_enum.c
index c249b5b039632a203c42dad423e9b0622cb301c3..41ff585cdde5a92b944fdb7f0501aa964e624327 100644 (file)
--- a/form/fty_enum.c
+++ b/form/fty_enum.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: fty_enum.c,v 1.24 2009/11/07 20:17:58 tom Exp $")
+MODULE_ID("$Id: fty_enum.c,v 1.25 2010/01/23 21:14:36 tom Exp $")

 
 typedef struct
   {
 
 typedef struct
   {


@@ -79,7 +79,7 @@ Generic_Enum_Type(void *arg)
          char **kptarget;
          int ccase, cunique;
 
          char **kptarget;
          int ccase, cunique;
 

-         T((T_CREATE("enumARG %p"), argp));
+         T((T_CREATE("enumARG %p"), (void *)argp));

          kwds = params->kwds;
          ccase = params->ccase;
          cunique = params->cunique;
          kwds = params->kwds;
          ccase = params->ccase;
          cunique = params->cunique;


@@ -155,7 +155,7 @@ Copy_Enum_Type(const void *argp)
 
       if (result)
        {
 
       if (result)
        {

-         T((T_CREATE("enumARG %p"), result));
+         T((T_CREATE("enumARG %p"), (void *)result));

          *result = *ap;
 
          if (ap->count > 0)
          *result = *ap;
 
          if (ap->count > 0)

diff --git a/form/fty_generic.c b/form/fty_generic.c
index 6ab5ed7771937d6c70a8ec28d8c2462ed65acf50..3e7a575a262304f34cd6a6e77a4e8865625fb6d2 100644 (file)
--- a/form/fty_generic.c
+++ b/form/fty_generic.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2008,2009 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2008-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            *


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

-MODULE_ID("$Id: fty_generic.c,v 1.4 2009/11/07 20:42:38 tom Exp $")
+MODULE_ID("$Id: fty_generic.c,v 1.5 2010/01/23 21:14:36 tom Exp $")

 
 /*
  * This is not a full implementation of a field type, but adds some
 
 /*
  * This is not a full implementation of a field type, but adds some


@@ -288,7 +288,10 @@ _nc_form_cursor(const FORM *form, int *pRow, int *pCol)
 
 #else
 extern void _nc_fty_generic(void);
 
 #else
 extern void _nc_fty_generic(void);

-void _nc_fty_generic(void) { }
+void
+_nc_fty_generic(void)
+{
+}

 #endif
 
 /* fty_generic.c ends here */
 #endif
 
 /* fty_generic.c ends here */

diff --git a/form/fty_int.c b/form/fty_int.c
index e13e5be203f7b66224a0307819ac6b2d35240648..e643ad975fc52c5434484d59537e3742dd51ac82 100644 (file)
--- a/form/fty_int.c
+++ b/form/fty_int.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: fty_int.c,v 1.24 2009/11/07 20:17:58 tom Exp $")
+MODULE_ID("$Id: fty_int.c,v 1.25 2010/01/23 21:14:36 tom Exp $")

 
 #if USE_WIDEC_SUPPORT
 #define isDigit(c) (iswdigit((wint_t)(c)) || isdigit(UChar(c)))
 
 #if USE_WIDEC_SUPPORT
 #define isDigit(c) (iswdigit((wint_t)(c)) || isdigit(UChar(c)))


@@ -80,7 +80,7 @@ Generic_This_Type(void *arg)
 
       if (argp)
        {
 
       if (argp)
        {

-         T((T_CREATE("thisARG %p"), argp));
+         T((T_CREATE("thisARG %p"), (void *)argp));

          *argp = *param;
        }
     }
          *argp = *param;
        }
     }


@@ -126,7 +126,7 @@ Copy_This_Type(const void *argp)
       result = typeMalloc(thisARG, 1);
       if (result)
        {
       result = typeMalloc(thisARG, 1);
       if (result)
        {

-         T((T_CREATE("thisARG %p"), result));
+         T((T_CREATE("thisARG %p"), (void *)result));

          *result = *ap;
        }
     }
          *result = *ap;
        }
     }

diff --git a/form/fty_num.c b/form/fty_num.c
index fd39bf83f45788679af3632f8174850a1c5ada0b..4bd71321d66acf67cfd4b4fd4d20e8ab2362d67a 100644 (file)
--- a/form/fty_num.c
+++ b/form/fty_num.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: fty_num.c,v 1.27 2009/11/07 20:17:58 tom Exp $")
+MODULE_ID("$Id: fty_num.c,v 1.28 2010/01/23 21:14:36 tom Exp $")

 
 #if HAVE_LOCALE_H
 #include <locale.h>
 
 #if HAVE_LOCALE_H
 #include <locale.h>


@@ -91,7 +91,7 @@ Generic_This_Type(void *arg)
 
       if (argn)
        {
 
       if (argn)
        {

-         T((T_CREATE("thisARG %p"), argn));
+         T((T_CREATE("thisARG %p"), (void *)argn));

          argn->precision = args->precision;
          argn->low = args->low;
          argn->high = args->high;
          argn->precision = args->precision;
          argn->low = args->low;
          argn->high = args->high;


@@ -145,7 +145,7 @@ Copy_This_Type(const void *argp)
       result = typeMalloc(thisARG, 1);
       if (result)
        {
       result = typeMalloc(thisARG, 1);
       if (result)
        {

-         T((T_CREATE("thisARG %p"), result));
+         T((T_CREATE("thisARG %p"), (void *)result));

          *result = *ap;
        }
     }
          *result = *ap;
        }
     }

diff --git a/form/fty_regex.c b/form/fty_regex.c
index 2a95c126a5197009cae778b4bda9a1210f32bc13..2c0a4caa6bb312d82247a92ecec8ea4cc9d83989 100644 (file)
--- a/form/fty_regex.c
+++ b/form/fty_regex.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: fty_regex.c,v 1.23 2009/11/07 20:17:58 tom Exp $")
+MODULE_ID("$Id: fty_regex.c,v 1.24 2010/01/23 21:14:37 tom Exp $")

 
 #if HAVE_REGEX_H_FUNCS         /* We prefer POSIX regex */
 #include <regex.h>
 
 #if HAVE_REGEX_H_FUNCS         /* We prefer POSIX regex */
 #include <regex.h>


@@ -117,12 +117,12 @@ Generic_RegularExpression_Type(void *arg MAYBE_UNUSED)
 
       if (preg)
        {
 
       if (preg)
        {

-         T((T_CREATE("RegExp_Arg %p"), preg));
+         T((T_CREATE("RegExp_Arg %p"), (void *)preg));

          if (((preg->pRegExp = typeMalloc(regex_t, 1)) != 0)
              && !regcomp(preg->pRegExp, rx,
                          (REG_EXTENDED | REG_NOSUB | REG_NEWLINE)))
            {
          if (((preg->pRegExp = typeMalloc(regex_t, 1)) != 0)
              && !regcomp(preg->pRegExp, rx,
                          (REG_EXTENDED | REG_NOSUB | REG_NEWLINE)))
            {

-             T((T_CREATE("regex_t %p"), preg->pRegExp));
+             T((T_CREATE("regex_t %p"), (void *)preg->pRegExp));

              preg->refCount = typeMalloc(unsigned long, 1);
 
              *(preg->refCount) = 1;
              preg->refCount = typeMalloc(unsigned long, 1);
 
              *(preg->refCount) = 1;

diff --git a/form/modules b/form/modules
index a8becbe0672f287c04905904370d50881e403dca..205356bba5543f8172cd5d6be58b9dd7eaba4d83 100644 (file)
--- a/form/modules
+++ b/form/modules
@@ -1,6 +1,6 @@
-# $Id: modules,v 1.16 2008/11/18 08:50:04 tom Exp $
+# $Id: modules,v 1.17 2010/01/23 16:26:37 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 1998-2006,2009 Free Software Foundation, Inc.                #
+# Copyright (c) 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 "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -33,46 +33,46 @@
 
 @ base
 # Library objects
 
 @ base
 # Library objects

-f_trace                lib             $(srcdir)       $(FORM_PRIV_H)
-fld_arg                lib             $(srcdir)       $(FORM_PRIV_H)
-fld_attr       lib             $(srcdir)       $(FORM_PRIV_H)
-fld_current    lib             $(srcdir)       $(FORM_PRIV_H)
-fld_def                lib             $(srcdir)       $(FORM_PRIV_H)
-fld_dup                lib             $(srcdir)       $(FORM_PRIV_H)
-fld_ftchoice   lib             $(srcdir)       $(FORM_PRIV_H)
-fld_ftlink     lib             $(srcdir)       $(FORM_PRIV_H)
-fld_info       lib             $(srcdir)       $(FORM_PRIV_H)
-fld_just       lib             $(srcdir)       $(FORM_PRIV_H)
-fld_link       lib             $(srcdir)       $(FORM_PRIV_H)
-fld_max                lib             $(srcdir)       $(FORM_PRIV_H)
-fld_move       lib             $(srcdir)       $(FORM_PRIV_H)
-fld_newftyp    lib             $(srcdir)       $(FORM_PRIV_H)
-fld_opts       lib             $(srcdir)       $(FORM_PRIV_H)
-fld_pad                lib             $(srcdir)       $(FORM_PRIV_H)
-fld_page       lib             $(srcdir)       $(FORM_PRIV_H)
-fld_stat       lib             $(srcdir)       $(FORM_PRIV_H)
-fld_type       lib             $(srcdir)       $(FORM_PRIV_H)
-fld_user       lib             $(srcdir)       $(FORM_PRIV_H)
-frm_cursor     lib             $(srcdir)       $(FORM_PRIV_H)
-frm_data       lib             $(srcdir)       $(FORM_PRIV_H)
-frm_def                lib             $(srcdir)       $(FORM_PRIV_H)
-frm_driver     lib             $(srcdir)       $(FORM_PRIV_H)
-frm_hook       lib             $(srcdir)       $(FORM_PRIV_H)
-frm_opts       lib             $(srcdir)       $(FORM_PRIV_H)
-frm_page       lib             $(srcdir)       $(FORM_PRIV_H)
-frm_post       lib             $(srcdir)       $(FORM_PRIV_H)
-frm_req_name   lib             $(srcdir)       $(FORM_PRIV_H)
-frm_scale      lib             $(srcdir)       $(FORM_PRIV_H)
-frm_sub                lib             $(srcdir)       $(FORM_PRIV_H)
-frm_user       lib             $(srcdir)       $(FORM_PRIV_H)
-frm_win                lib             $(srcdir)       $(FORM_PRIV_H)
-fty_alnum      lib             $(srcdir)       $(FORM_PRIV_H)
-fty_alpha      lib             $(srcdir)       $(FORM_PRIV_H)
-fty_enum       lib             $(srcdir)       $(FORM_PRIV_H)
-fty_generic    lib             $(srcdir)       $(FORM_PRIV_H)
-fty_int                lib             $(srcdir)       $(FORM_PRIV_H)
-fty_ipv4       lib             $(srcdir)       $(FORM_PRIV_H)
-fty_num                lib             $(srcdir)       $(FORM_PRIV_H)
-fty_regex      lib             $(srcdir)       $(FORM_PRIV_H)
+f_trace                lib             $(srcdir)       $(HEADER_DEPS)
+fld_arg                lib             $(srcdir)       $(HEADER_DEPS)
+fld_attr       lib             $(srcdir)       $(HEADER_DEPS)
+fld_current    lib             $(srcdir)       $(HEADER_DEPS)
+fld_def                lib             $(srcdir)       $(HEADER_DEPS)
+fld_dup                lib             $(srcdir)       $(HEADER_DEPS)
+fld_ftchoice   lib             $(srcdir)       $(HEADER_DEPS)
+fld_ftlink     lib             $(srcdir)       $(HEADER_DEPS)
+fld_info       lib             $(srcdir)       $(HEADER_DEPS)
+fld_just       lib             $(srcdir)       $(HEADER_DEPS)
+fld_link       lib             $(srcdir)       $(HEADER_DEPS)
+fld_max                lib             $(srcdir)       $(HEADER_DEPS)
+fld_move       lib             $(srcdir)       $(HEADER_DEPS)
+fld_newftyp    lib             $(srcdir)       $(HEADER_DEPS)
+fld_opts       lib             $(srcdir)       $(HEADER_DEPS)
+fld_pad                lib             $(srcdir)       $(HEADER_DEPS)
+fld_page       lib             $(srcdir)       $(HEADER_DEPS)
+fld_stat       lib             $(srcdir)       $(HEADER_DEPS)
+fld_type       lib             $(srcdir)       $(HEADER_DEPS)
+fld_user       lib             $(srcdir)       $(HEADER_DEPS)
+frm_cursor     lib             $(srcdir)       $(HEADER_DEPS)
+frm_data       lib             $(srcdir)       $(HEADER_DEPS)
+frm_def                lib             $(srcdir)       $(HEADER_DEPS)
+frm_driver     lib             $(srcdir)       $(HEADER_DEPS)
+frm_hook       lib             $(srcdir)       $(HEADER_DEPS)
+frm_opts       lib             $(srcdir)       $(HEADER_DEPS)
+frm_page       lib             $(srcdir)       $(HEADER_DEPS)
+frm_post       lib             $(srcdir)       $(HEADER_DEPS)
+frm_req_name   lib             $(srcdir)       $(HEADER_DEPS)
+frm_scale      lib             $(srcdir)       $(HEADER_DEPS)
+frm_sub                lib             $(srcdir)       $(HEADER_DEPS)
+frm_user       lib             $(srcdir)       $(HEADER_DEPS)
+frm_win                lib             $(srcdir)       $(HEADER_DEPS)
+fty_alnum      lib             $(srcdir)       $(HEADER_DEPS)
+fty_alpha      lib             $(srcdir)       $(HEADER_DEPS)
+fty_enum       lib             $(srcdir)       $(HEADER_DEPS)
+fty_generic    lib             $(srcdir)       $(HEADER_DEPS)
+fty_int                lib             $(srcdir)       $(HEADER_DEPS)
+fty_ipv4       lib             $(srcdir)       $(HEADER_DEPS)
+fty_num                lib             $(srcdir)       $(HEADER_DEPS)
+fty_regex      lib             $(srcdir)       $(HEADER_DEPS)

 
 # vile:makemode
 
 # vile:makemode

diff --git a/include/curses.h.in b/include/curses.h.in
index ac5a400a761d04571cc9956b92214a2b0464d862..aecd7c5405d9f1ed49cf3810ccb06570282b0c63 100644 (file)
--- a/include/curses.h.in
+++ b/include/curses.h.in
@@ -32,7 +32,7 @@
  *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
  *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 

-/* $Id: curses.h.in,v 1.208 2010/01/09 19:34:26 tom Exp $ */
+/* $Id: curses.h.in,v 1.209 2010/01/23 21:54:01 tom Exp $ */

 
 #ifndef __NCURSES_H
 #define __NCURSES_H
 
 #ifndef __NCURSES_H
 #define __NCURSES_H


@@ -1103,12 +1103,16 @@ extern NCURSES_EXPORT(int) NCURSES_SP_NAME(use_legacy_coding) (SCREEN*, int);
 
 #if !NCURSES_OPAQUE
 #if defined(_XOPEN_SOURCE_EXTENDED) && @NCURSES_EXT_COLORS@
 
 #if !NCURSES_OPAQUE
 #if defined(_XOPEN_SOURCE_EXTENDED) && @NCURSES_EXT_COLORS@

-#define wattrset(win,at)       ((win)->_color = PAIR_NUMBER(at), \
-                                 (win)->_attrs = (at), \
-                                 NCURSES_CAST(int, (win)->_attrs))
+#define wattrset(win,at)       ((win) \
+                                 ? ((win)->_color = PAIR_NUMBER(at), \
+                                     (win)->_attrs = (at), \
+                                     OK) \
+                                 : ERR)

 #else
 #else

-#define wattrset(win,at)        ((win)->_attrs = (at), \
-                                NCURSES_CAST(int, (win)->_attrs))
+#define wattrset(win,at)        ((win) \
+                                 ? ((win)->_attrs = (at), \
+                                    OK) \
+                                 : ERR)

 #endif
 #endif /* NCURSES_OPAQUE */
 
 #endif
 #endif /* NCURSES_OPAQUE */
 

diff --git a/menu/Makefile.in b/menu/Makefile.in
index ad5eecc5277dd5554b440af172e97fa7994dbfc7..4bcb0fb0ee9292500ccb028723e385264d0a7d40 100644 (file)
--- a/menu/Makefile.in
+++ b/menu/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.50 2009/03/28 18:22:39 Charles.Wilson Exp $
+# $Id: Makefile.in,v 1.51 2010/01/23 16:36:12 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.                #
+# Copyright (c) 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 "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -141,7 +141,7 @@ $(DESTDIR)$(libdir) :
        -rm -f $@
        cp $(srcdir)/mf_common.h $@
 
        -rm -f $@
        cp $(srcdir)/mf_common.h $@
 

-MENU_PRIV_H = \
+HEADER_DEPS = \

        $(srcdir)/menu.priv.h \
        $(AUTO_SRC) \
        ../include/curses.h
        $(srcdir)/menu.priv.h \
        $(AUTO_SRC) \
        ../include/curses.h

diff --git a/menu/m_attribs.c b/menu/m_attribs.c
index 388d2de66c46b5ba1afa96342653605f23ee6250..c41d558ec994b8e99040a7f9f0a78064293a1a98 100644 (file)
--- a/menu/m_attribs.c
+++ b/menu/m_attribs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright (c) 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 +37,7 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_attribs.c,v 1.15 2008/11/16 00:19:59 juergen Exp $")
+MODULE_ID("$Id: m_attribs.c,v 1.16 2010/01/23 21:16:54 tom Exp $")

 
 /* Macro to redraw menu if it is posted and changed */
 #define Refresh_Menu(menu) \
 
 /* Macro to redraw menu if it is posted and changed */
 #define Refresh_Menu(menu) \


@@ -67,7 +67,7 @@ NCURSES_IMPEXP int NCURSES_API set_menu_ ## name (MENU* menu, chtype attr) \
 #define GEN_MENU_ATTR_GET_FCT( name ) \
 NCURSES_IMPEXP chtype NCURSES_API menu_ ## name (const MENU * menu)\
 {\
 #define GEN_MENU_ATTR_GET_FCT( name ) \
 NCURSES_IMPEXP chtype NCURSES_API menu_ ## name (const MENU * menu)\
 {\

-   T((T_CALLED("menu_" #name "(%p)"), menu));\
+   T((T_CALLED("menu_" #name "(%p)"), (const void *) menu));\

    returnAttr(Normalize_Menu( menu ) -> name);\
 }
 
    returnAttr(Normalize_Menu( menu ) -> name);\
 }
 

diff --git a/menu/m_cursor.c b/menu/m_cursor.c
index 77f9c759269f4eb5e8189a170f83a68659dc7030..9891de4a9450399b6d22c45fa63a5016d5dce991 100644 (file)
--- a/menu/m_cursor.c
+++ b/menu/m_cursor.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 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 +37,7 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_cursor.c,v 1.21 2009/02/28 21:02:46 juergen Exp $")
+MODULE_ID("$Id: m_cursor.c,v 1.22 2010/01/23 21:20:10 tom Exp $")

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


@@ -86,7 +86,7 @@ pos_menu_cursor(const MENU * menu)
   int x = 0, y = 0;
   int err = _nc_menu_cursor_pos(menu, (ITEM *) 0, &y, &x);
 
   int x = 0, y = 0;
   int err = _nc_menu_cursor_pos(menu, (ITEM *) 0, &y, &x);
 

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

 
   if (E_OK == err)
     {
 
   if (E_OK == err)
     {

diff --git a/menu/m_driver.c b/menu/m_driver.c
index 5b7a89e386a5170c8ac4ebb5095d059a99444621..deeff4710c089ce3497c4eedb159843d8b92dc57 100644 (file)
--- a/menu/m_driver.c
+++ b/menu/m_driver.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 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 +37,7 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_driver.c,v 1.28 2009/02/28 21:02:46 juergen Exp $")
+MODULE_ID("$Id: m_driver.c,v 1.29 2010/01/23 21:20:10 tom Exp $")

 
 /* Macros */
 
 
 /* Macros */
 


@@ -121,7 +121,8 @@ _nc_Match_Next_Character_In_Item_Name
   bool found = FALSE, passed = FALSE;
   int idx, last;
 
   bool found = FALSE, passed = FALSE;
   int idx, last;
 

-  T((T_CALLED("_nc_Match_Next_Character(%p,%d,%p)"), menu, ch, item));
+  T((T_CALLED("_nc_Match_Next_Character(%p,%d,%p)"),
+     (void *)menu, ch, (void *)item));

 
   assert(menu && item && *item);
   idx = (*item)->index;
 
   assert(menu && item && *item);
   idx = (*item)->index;


@@ -220,7 +221,7 @@ menu_driver(MENU * menu, int c)
   ITEM *item;
   int my_top_row, rdiff;
 
   ITEM *item;
   int my_top_row, rdiff;
 

-  T((T_CALLED("menu_driver(%p,%d)"), menu, c));
+  T((T_CALLED("menu_driver(%p,%d)"), (void *)menu, c));

 
   if (!menu)
     RETURN(E_BAD_ARGUMENT);
 
   if (!menu)
     RETURN(E_BAD_ARGUMENT);

diff --git a/menu/m_format.c b/menu/m_format.c
index 773cb27e774fc16f6da47390b998899d7040b0c2..8e68a036ee2eff08d4f683d3c0f3ecc1b5616acf 100644 (file)
--- a/menu/m_format.c
+++ b/menu/m_format.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright (c) 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 +37,7 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_format.c,v 1.15 2004/12/11 23:11:21 tom Exp $")
+MODULE_ID("$Id: m_format.c,v 1.16 2010/01/23 21:20:10 tom Exp $")

 
 #define minimum(a,b) ((a)<(b) ? (a): (b))
 
 
 #define minimum(a,b) ((a)<(b) ? (a): (b))
 


@@ -60,7 +60,7 @@ set_menu_format(MENU * menu, int rows, int cols)
 {
   int total_rows, total_cols;
 
 {
   int total_rows, total_cols;
 

-  T((T_CALLED("set_menu_format(%p,%d,%d)"), menu, rows, cols));
+  T((T_CALLED("set_menu_format(%p,%d,%d)"), (void *)menu, rows, cols));

 
   if (rows < 0 || cols < 0)
     RETURN(E_BAD_ARGUMENT);
 
   if (rows < 0 || cols < 0)
     RETURN(E_BAD_ARGUMENT);

diff --git a/menu/m_global.c b/menu/m_global.c
index 267c8564287739a33d91ff167dc68a339cfa83ee..90f6f25925b7fcfd2b60c99b74956dd7e99a4729 100644 (file)
--- a/menu/m_global.c
+++ b/menu/m_global.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2005,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 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 +37,7 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_global.c,v 1.24 2009/02/28 21:02:46 juergen Exp $")
+MODULE_ID("$Id: m_global.c,v 1.25 2010/01/23 21:20:10 tom Exp $")

 
 static char mark[] = "-";
 /* *INDENT-OFF* */
 
 static char mark[] = "-";
 /* *INDENT-OFF* */


@@ -253,7 +253,7 @@ _nc_Calculate_Text_Width(const TEXT * item /*FIXME: limit length */ )
 #if USE_WIDEC_SUPPORT
   int result = item->length;
 
 #if USE_WIDEC_SUPPORT
   int result = item->length;
 

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

   if (result != 0 && item->str != 0)
     {
       int count = mbstowcs(0, item->str, 0);
   if (result != 0 && item->str != 0)
     {
       int count = mbstowcs(0, item->str, 0);

diff --git a/menu/m_hook.c b/menu/m_hook.c
index 8d768a303ffcd959c0b1c65cc34ce99c4e6768b7..6125d052e7a2db870157975039409a049f534b46 100644 (file)
--- a/menu/m_hook.c
+++ b/menu/m_hook.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright (c) 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 +37,7 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_hook.c,v 1.14 2004/12/25 21:39:52 tom Exp $")
+MODULE_ID("$Id: m_hook.c,v 1.15 2010/01/23 21:16:54 tom Exp $")

 
 /* "Template" macro to generate function to set application specific hook */
 #define GEN_HOOK_SET_FUNCTION( typ, name ) \
 
 /* "Template" macro to generate function to set application specific hook */
 #define GEN_HOOK_SET_FUNCTION( typ, name ) \


@@ -52,7 +52,7 @@ NCURSES_IMPEXP int NCURSES_API set_ ## typ ## _ ## name (MENU *menu, Menu_Hook f
 #define GEN_HOOK_GET_FUNCTION( typ, name ) \
 NCURSES_IMPEXP Menu_Hook NCURSES_API typ ## _ ## name ( const MENU *menu )\
 {\
 #define GEN_HOOK_GET_FUNCTION( typ, name ) \
 NCURSES_IMPEXP Menu_Hook NCURSES_API typ ## _ ## name ( const MENU *menu )\
 {\

-   T((T_CALLED(#typ "_" #name "(%p)"), menu));\
+   T((T_CALLED(#typ "_" #name "(%p)"), (const void *) menu));\

    returnMenuHook(Normalize_Menu(menu) -> typ ## name);\
 }
 
    returnMenuHook(Normalize_Menu(menu) -> typ ## name);\
 }
 

diff --git a/menu/m_item_cur.c b/menu/m_item_cur.c
index dac12ed91c5e65ec5feca3aa1f68503add41415b..18b1a2726af6034d0c7b163bc5b44afc5e59e35a 100644 (file)
--- a/menu/m_item_cur.c
+++ b/menu/m_item_cur.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright (c) 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 +37,7 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_item_cur.c,v 1.17 2004/12/25 21:57:38 tom Exp $")
+MODULE_ID("$Id: m_item_cur.c,v 1.18 2010/01/23 21:20:10 tom Exp $")

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


@@ -50,7 +50,7 @@ MODULE_ID("$Id: m_item_cur.c,v 1.17 2004/12/25 21:57:38 tom Exp $")
 NCURSES_EXPORT(int)
 set_current_item(MENU * menu, ITEM * item)
 {
 NCURSES_EXPORT(int)
 set_current_item(MENU * menu, ITEM * item)
 {

-  T((T_CALLED("set_current_item(%p,%p)"), menu, item));
+  T((T_CALLED("set_current_item(%p,%p)"), (void *)menu, (void *)item));

 
   if (menu && item && (item->imenu == menu))
     {
 
   if (menu && item && (item->imenu == menu))
     {


@@ -91,7 +91,7 @@ set_current_item(MENU * menu, ITEM * item)
 NCURSES_EXPORT(ITEM *)
 current_item(const MENU * menu)
 {
 NCURSES_EXPORT(ITEM *)
 current_item(const MENU * menu)
 {

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

   returnItem((menu && menu->items) ? menu->curitem : (ITEM *) 0);
 }
 
   returnItem((menu && menu->items) ? menu->curitem : (ITEM *) 0);
 }
 


@@ -106,7 +106,7 @@ current_item(const MENU * menu)
 NCURSES_EXPORT(int)
 item_index(const ITEM * item)
 {
 NCURSES_EXPORT(int)
 item_index(const ITEM * item)
 {

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

   returnCode((item && item->imenu) ? item->index : ERR);
 }
 
   returnCode((item && item->imenu) ? item->index : ERR);
 }
 

diff --git a/menu/m_item_nam.c b/menu/m_item_nam.c
index 05a169340b45050239816bc07858762730c8b79a..3ed1d37668a29a1809b9e74055e5b52858f8a41b 100644 (file)
--- a/menu/m_item_nam.c
+++ b/menu/m_item_nam.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright (c) 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 +37,7 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_item_nam.c,v 1.14 2004/12/25 21:41:54 tom Exp $")
+MODULE_ID("$Id: m_item_nam.c,v 1.15 2010/01/23 21:20:10 tom Exp $")

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


@@ -50,7 +50,7 @@ MODULE_ID("$Id: m_item_nam.c,v 1.14 2004/12/25 21:41:54 tom Exp $")
 NCURSES_EXPORT(const char *)
 item_name(const ITEM * item)
 {
 NCURSES_EXPORT(const char *)
 item_name(const ITEM * item)
 {

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

   returnCPtr((item) ? item->name.str : (char *)0);
 }
 
   returnCPtr((item) ? item->name.str : (char *)0);
 }
 


@@ -65,7 +65,7 @@ item_name(const ITEM * item)
 NCURSES_EXPORT(const char *)
 item_description(const ITEM * item)
 {
 NCURSES_EXPORT(const char *)
 item_description(const ITEM * item)
 {

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

   returnCPtr((item) ? item->description.str : (char *)0);
 }
 
   returnCPtr((item) ? item->description.str : (char *)0);
 }
 

diff --git a/menu/m_item_new.c b/menu/m_item_new.c
index b2f4646f72821cbfd4b6f1d172d7f993f1ec4931..1debc2b344012c97af637f319f2aa3d8d7df5d5f 100644 (file)
--- a/menu/m_item_new.c
+++ b/menu/m_item_new.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -44,7 +44,7 @@
 #endif
 #endif
 
 #endif
 #endif
 

-MODULE_ID("$Id: m_item_new.c,v 1.29 2009/12/12 18:31:28 tom Exp $")
+MODULE_ID("$Id: m_item_new.c,v 1.30 2010/01/23 21:20:11 tom Exp $")

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


@@ -162,7 +162,7 @@ new_item(const char *name, const char *description)
 NCURSES_EXPORT(int)
 free_item(ITEM * item)
 {
 NCURSES_EXPORT(int)
 free_item(ITEM * item)
 {

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

 
   if (!item)
     RETURN(E_BAD_ARGUMENT);
 
   if (!item)
     RETURN(E_BAD_ARGUMENT);


@@ -197,7 +197,7 @@ set_menu_mark(MENU * menu, const char *mark)
 {
   unsigned l;
 
 {
   unsigned l;
 

-  T((T_CALLED("set_menu_mark(%p,%s)"), menu, _nc_visbuf(mark)));
+  T((T_CALLED("set_menu_mark(%p,%s)"), (void *)menu, _nc_visbuf(mark)));

 
   if (mark && (*mark != '\0') && Is_Printable_String(mark))
     l = strlen(mark);
 
   if (mark && (*mark != '\0') && Is_Printable_String(mark))
     l = strlen(mark);


@@ -268,7 +268,7 @@ set_menu_mark(MENU * menu, const char *mark)
 NCURSES_EXPORT(const char *)
 menu_mark(const MENU * menu)
 {
 NCURSES_EXPORT(const char *)
 menu_mark(const MENU * menu)
 {

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

   returnPtr(Normalize_Menu(menu)->mark);
 }
 
   returnPtr(Normalize_Menu(menu)->mark);
 }
 

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

- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright (c) 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 +37,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.18 2010/01/23 21:20:10 tom Exp $")

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


@@ -53,7 +53,7 @@ MODULE_ID("$Id: m_item_opt.c,v 1.17 2004/12/25 21:32:54 tom Exp $")
 NCURSES_EXPORT(int)
 set_item_opts(ITEM * item, Item_Options opts)
 {
 NCURSES_EXPORT(int)
 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;
 


@@ -100,7 +100,7 @@ item_opts_off(ITEM * item, Item_Options opts)
 
                                   NULL item itself to adjust its behavior */
 
 
                                   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);


@@ -128,7 +128,7 @@ item_opts_on(ITEM * item, Item_Options opts)
 
                                   NULL item itself to adjust its behavior */
 
 
                                   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)


@@ -152,7 +152,7 @@ item_opts_on(ITEM * item, Item_Options opts)
 NCURSES_EXPORT(Item_Options)
 item_opts(const ITEM * item)
 {
 NCURSES_EXPORT(Item_Options)
 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);
 }
 

diff --git a/menu/m_item_top.c b/menu/m_item_top.c
index 7268a0e49f15440222534c98026c8c05abe97266..752e20d9edbb45a0d9428895983e73f737d02c06 100644 (file)
--- a/menu/m_item_top.c
+++ b/menu/m_item_top.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright (c) 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 +37,7 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_item_top.c,v 1.10 2004/12/11 23:29:34 tom Exp $")
+MODULE_ID("$Id: m_item_top.c,v 1.11 2010/01/23 21:20:10 tom Exp $")

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


@@ -54,7 +54,7 @@ set_top_row(MENU * menu, int row)
 {
   ITEM *item;
 
 {
   ITEM *item;
 

-  T((T_CALLED("set_top_row(%p,%d)"), menu, row));
+  T((T_CALLED("set_top_row(%p,%d)"), (void *)menu, row));

 
   if (menu)
     {
 
   if (menu)
     {


@@ -94,7 +94,7 @@ set_top_row(MENU * menu, int row)
 NCURSES_EXPORT(int)
 top_row(const MENU * menu)
 {
 NCURSES_EXPORT(int)
 top_row(const MENU * menu)
 {

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

   if (menu && menu->items && *(menu->items))
     {
       assert((menu->toprow >= 0) && (menu->toprow < menu->rows));
   if (menu && menu->items && *(menu->items))
     {
       assert((menu->toprow >= 0) && (menu->toprow < menu->rows));

diff --git a/menu/m_item_use.c b/menu/m_item_use.c
index 06a5baf984e8024f6839595a359e7164bf61ce69..8cf294bc29e35c9d85cbf3c6e9bfe05f6f666c86 100644 (file)
--- a/menu/m_item_use.c
+++ b/menu/m_item_use.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright (c) 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 +37,7 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_item_use.c,v 1.16 2004/12/25 21:33:31 tom Exp $")
+MODULE_ID("$Id: m_item_use.c,v 1.17 2010/01/23 21:20:10 tom Exp $")

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


@@ -51,7 +51,7 @@ MODULE_ID("$Id: m_item_use.c,v 1.16 2004/12/25 21:33:31 tom Exp $")
 NCURSES_EXPORT(int)
 set_item_userptr(ITEM * item, void *userptr)
 {
 NCURSES_EXPORT(int)
 set_item_userptr(ITEM * item, void *userptr)
 {

-  T((T_CALLED("set_item_userptr(%p,%p)"), item, userptr));
+  T((T_CALLED("set_item_userptr(%p,%p)"), (void *)item, (void *)userptr));

   Normalize_Item(item)->userptr = userptr;
   RETURN(E_OK);
 }
   Normalize_Item(item)->userptr = userptr;
   RETURN(E_OK);
 }


@@ -69,7 +69,7 @@ set_item_userptr(ITEM * item, void *userptr)
 NCURSES_EXPORT(void *)
 item_userptr(const ITEM * item)
 {
 NCURSES_EXPORT(void *)
 item_userptr(const ITEM * item)
 {

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

   returnVoidPtr(Normalize_Item(item)->userptr);
 }
 
   returnVoidPtr(Normalize_Item(item)->userptr);
 }
 

diff --git a/menu/m_item_val.c b/menu/m_item_val.c
index cebf693fbd349cff41248b46ee1fa40d428b4623..337dbfcc6808a1724456a3347f360d926268e377 100644 (file)
--- a/menu/m_item_val.c
+++ b/menu/m_item_val.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright (c) 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 +37,7 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_item_val.c,v 1.14 2004/12/11 23:29:34 tom Exp $")
+MODULE_ID("$Id: m_item_val.c,v 1.15 2010/01/23 21:20:10 tom Exp $")

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


@@ -57,7 +57,7 @@ set_item_value(ITEM * item, bool value)
 {
   MENU *menu;
 
 {
   MENU *menu;
 

-  T((T_CALLED("set_item_value(%p,%d)"), item, value));
+  T((T_CALLED("set_item_value(%p,%d)"), (void *)item, value));

   if (item)
     {
       menu = item->imenu;
   if (item)
     {
       menu = item->imenu;


@@ -97,7 +97,7 @@ set_item_value(ITEM * item, bool value)
 NCURSES_EXPORT(bool)
 item_value(const ITEM * item)
 {
 NCURSES_EXPORT(bool)
 item_value(const ITEM * item)
 {

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

   returnBool((Normalize_Item(item)->value) ? TRUE : FALSE);
 }
 
   returnBool((Normalize_Item(item)->value) ? TRUE : FALSE);
 }
 

diff --git a/menu/m_item_vis.c b/menu/m_item_vis.c
index f8fb97f028cb0d2ebfc168dde1d606673f44868c..ff847405437091c93f216249cb31bc37b382381c 100644 (file)
--- a/menu/m_item_vis.c
+++ b/menu/m_item_vis.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright (c) 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 +37,7 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_item_vis.c,v 1.15 2004/12/25 21:40:09 tom Exp $")
+MODULE_ID("$Id: m_item_vis.c,v 1.16 2010/01/23 21:20:10 tom Exp $")

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


@@ -54,7 +54,7 @@ item_visible(const ITEM * item)
 {
   MENU *menu;
 
 {
   MENU *menu;
 

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

   if (item &&
       (menu = item->imenu) &&
       (menu->status & _POSTED) &&
   if (item &&
       (menu = item->imenu) &&
       (menu->status & _POSTED) &&

diff --git a/menu/m_items.c b/menu/m_items.c
index 3e8f70b0fa7dccb3ecfc8ec9b211b18fd684b6ce..539768551d80cff8612d7256eb73f6d2dfcae245 100644 (file)
--- a/menu/m_items.c
+++ b/menu/m_items.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


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

-MODULE_ID("$Id: m_items.c,v 1.16 2005/01/16 01:02:23 tom Exp $")
+MODULE_ID("$Id: m_items.c,v 1.17 2010/01/23 21:20:10 tom Exp $")

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


@@ -55,7 +55,7 @@ MODULE_ID("$Id: m_items.c,v 1.16 2005/01/16 01:02:23 tom Exp $")
 NCURSES_EXPORT(int)
 set_menu_items(MENU * menu, ITEM ** items)
 {
 NCURSES_EXPORT(int)
 set_menu_items(MENU * menu, ITEM ** items)
 {

-  T((T_CALLED("set_menu_items(%p,%p)"), menu, items));
+  T((T_CALLED("set_menu_items(%p,%p)"), (void *)menu, (void *)items));

 
   if (!menu || (items && !(*items)))
     RETURN(E_BAD_ARGUMENT);
 
   if (!menu || (items && !(*items)))
     RETURN(E_BAD_ARGUMENT);


@@ -87,7 +87,7 @@ set_menu_items(MENU * menu, ITEM ** items)
 NCURSES_EXPORT(ITEM **)
 menu_items(const MENU * menu)
 {
 NCURSES_EXPORT(ITEM **)
 menu_items(const MENU * menu)
 {

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

   returnItemPtr(menu ? menu->items : (ITEM **) 0);
 }
 
   returnItemPtr(menu ? menu->items : (ITEM **) 0);
 }
 


@@ -103,7 +103,7 @@ menu_items(const MENU * menu)
 NCURSES_EXPORT(int)
 item_count(const MENU * menu)
 {
 NCURSES_EXPORT(int)
 item_count(const MENU * menu)
 {

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

   returnCode(menu ? menu->nitems : -1);
 }
 
   returnCode(menu ? menu->nitems : -1);
 }
 

diff --git a/menu/m_new.c b/menu/m_new.c
index ca106c2d1286ed18c29405ca8b64223d3609e137..79f9292a7b3c75f2ac3ede6b8d768b8e62fbe0cb 100644 (file)
--- a/menu/m_new.c
+++ b/menu/m_new.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2006,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 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 +37,7 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_new.c,v 1.20 2009/12/12 18:31:28 tom Exp $")
+MODULE_ID("$Id: m_new.c,v 1.21 2010/01/23 21:20:11 tom Exp $")

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


@@ -56,7 +56,7 @@ NCURSES_SP_NAME(new_menu) (NCURSES_SP_DCLx ITEM ** items)
   int err = E_SYSTEM_ERROR;
   MENU *menu = typeCalloc(MENU, 1);
 
   int err = E_SYSTEM_ERROR;
   MENU *menu = typeCalloc(MENU, 1);
 

-  T((T_CALLED("new_menu(%p,%p)"), SP_PARM, items));
+  T((T_CALLED("new_menu(%p,%p)"), (void *)SP_PARM, (void *)items));

   if (menu)
     {
       *menu = _nc_Default_Menu;
   if (menu)
     {
       *menu = _nc_Default_Menu;


@@ -122,7 +122,7 @@ new_menu(ITEM ** items)
 NCURSES_EXPORT(int)
 free_menu(MENU * menu)
 {
 NCURSES_EXPORT(int)
 free_menu(MENU * menu)
 {

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

   if (!menu)
     RETURN(E_BAD_ARGUMENT);
 
   if (!menu)
     RETURN(E_BAD_ARGUMENT);
 

diff --git a/menu/m_opts.c b/menu/m_opts.c
index a7370b06f8e59402550527d315bdb4fcd19d0a93..bc6924b65149fd10e860841eab57220e40a61d1d 100644 (file)
--- a/menu/m_opts.c
+++ b/menu/m_opts.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright (c) 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 +37,7 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_opts.c,v 1.19 2004/12/25 21:36:12 tom Exp $")
+MODULE_ID("$Id: m_opts.c,v 1.20 2010/01/23 21:20:10 tom Exp $")

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


@@ -55,7 +55,7 @@ MODULE_ID("$Id: m_opts.c,v 1.19 2004/12/25 21:36:12 tom Exp $")
 NCURSES_EXPORT(int)
 set_menu_opts(MENU * menu, Menu_Options opts)
 {
 NCURSES_EXPORT(int)
 set_menu_opts(MENU * menu, Menu_Options opts)
 {

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

 
   opts &= ALL_MENU_OPTS;
 
 
   opts &= ALL_MENU_OPTS;
 


@@ -119,7 +119,7 @@ menu_opts_off(MENU * menu, Menu_Options opts)
 
                                   NULL menu itself to adjust its behavior */
 
 
                                   NULL menu itself to adjust its behavior */
 

-  T((T_CALLED("menu_opts_off(%p,%d)"), menu, opts));
+  T((T_CALLED("menu_opts_off(%p,%d)"), (void *)menu, opts));

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


@@ -152,7 +152,7 @@ menu_opts_on(MENU * menu, Menu_Options opts)
 
                                   NULL menu itself to adjust its behavior */
 
 
                                   NULL menu itself to adjust its behavior */
 

-  T((T_CALLED("menu_opts_on(%p,%d)"), menu, opts));
+  T((T_CALLED("menu_opts_on(%p,%d)"), (void *)menu, opts));

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


@@ -176,7 +176,7 @@ menu_opts_on(MENU * menu, Menu_Options opts)
 NCURSES_EXPORT(Menu_Options)
 menu_opts(const MENU * menu)
 {
 NCURSES_EXPORT(Menu_Options)
 menu_opts(const MENU * menu)
 {

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

   returnMenuOpts(ALL_MENU_OPTS & Normalize_Menu(menu)->opt);
 }
 
   returnMenuOpts(ALL_MENU_OPTS & Normalize_Menu(menu)->opt);
 }
 

diff --git a/menu/m_pad.c b/menu/m_pad.c
index 79659aa233fbd82c3f4ce8e8ee974f49e8be57c4..caa2f9e207b1eeaa6f8d1368f6d3a0f7af3df238 100644 (file)
--- a/menu/m_pad.c
+++ b/menu/m_pad.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright (c) 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 +37,7 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_pad.c,v 1.11 2009/02/07 23:11:44 tom Exp $")
+MODULE_ID("$Id: m_pad.c,v 1.12 2010/01/23 21:20:10 tom Exp $")

 
 /* Macro to redraw menu if it is posted and changed */
 #define Refresh_Menu(menu) \
 
 /* Macro to redraw menu if it is posted and changed */
 #define Refresh_Menu(menu) \


@@ -63,7 +63,7 @@ set_menu_pad(MENU * menu, int pad)
 {
   bool do_refresh = (menu != (MENU *) 0);
 
 {
   bool do_refresh = (menu != (MENU *) 0);
 

-  T((T_CALLED("set_menu_pad(%p,%d)"), menu, pad));
+  T((T_CALLED("set_menu_pad(%p,%d)"), (void *)menu, pad));

 
   if (!isprint(UChar(pad)))
     RETURN(E_BAD_ARGUMENT);
 
   if (!isprint(UChar(pad)))
     RETURN(E_BAD_ARGUMENT);


@@ -88,7 +88,7 @@ set_menu_pad(MENU * menu, int pad)
 NCURSES_EXPORT(int)
 menu_pad(const MENU * menu)
 {
 NCURSES_EXPORT(int)
 menu_pad(const MENU * menu)
 {

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

   returnCode(Normalize_Menu(menu)->pad);
 }
 
   returnCode(Normalize_Menu(menu)->pad);
 }
 

diff --git a/menu/m_pattern.c b/menu/m_pattern.c
index 1171390e214c8fae89aca191d12a0e315b42207c..1764d05fbc0c2a60ff92f6bcde2f9dedc86a954c 100644 (file)
--- a/menu/m_pattern.c
+++ b/menu/m_pattern.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2006,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 +37,7 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_pattern.c,v 1.15 2006/11/04 18:46:39 tom Exp $")
+MODULE_ID("$Id: m_pattern.c,v 1.16 2010/01/23 21:20:10 tom Exp $")

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


@@ -55,7 +55,7 @@ menu_pattern(const MENU * menu)
 {
   static char empty[] = "";
 
 {
   static char empty[] = "";
 

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

   returnPtr(menu ? (menu->pattern ? menu->pattern : empty) : 0);
 }
 
   returnPtr(menu ? (menu->pattern ? menu->pattern : empty) : 0);
 }
 


@@ -78,7 +78,7 @@ set_menu_pattern(MENU * menu, const char *p)
   ITEM *matchitem;
   int matchpos;
 
   ITEM *matchitem;
   int matchpos;
 

-  T((T_CALLED("set_menu_pattern(%p,%s)"), menu, _nc_visbuf(p)));
+  T((T_CALLED("set_menu_pattern(%p,%s)"), (void *)menu, _nc_visbuf(p)));

 
   if (!menu || !p)
     RETURN(E_BAD_ARGUMENT);
 
   if (!menu || !p)
     RETURN(E_BAD_ARGUMENT);

diff --git a/menu/m_post.c b/menu/m_post.c
index 6caac6a8313589a3c5d1ebf3d57a423ea9d5194b..08314a56d6972e60ba9b30c4c09abf4c07e64b2a 100644 (file)
--- a/menu/m_post.c
+++ b/menu/m_post.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2004,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 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 +37,7 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_post.c,v 1.27 2009/02/28 21:02:46 juergen Exp $")
+MODULE_ID("$Id: m_post.c,v 1.28 2010/01/23 21:20:11 tom Exp $")

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


@@ -269,7 +269,7 @@ _nc_Draw_Menu(const MENU * menu)
 NCURSES_EXPORT(int)
 post_menu(MENU * menu)
 {
 NCURSES_EXPORT(int)
 post_menu(MENU * menu)
 {

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

 
   if (!menu)
     RETURN(E_BAD_ARGUMENT);
 
   if (!menu)
     RETURN(E_BAD_ARGUMENT);


@@ -343,7 +343,7 @@ unpost_menu(MENU * menu)
 {
   WINDOW *win;
 
 {
   WINDOW *win;
 

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

 
   if (!menu)
     RETURN(E_BAD_ARGUMENT);
 
   if (!menu)
     RETURN(E_BAD_ARGUMENT);

diff --git a/menu/m_scale.c b/menu/m_scale.c
index 96c2d84eb3af769ef23ba3701aa8e3f0f9351c8b..068a1cc8c53893e3b599d3a048245090a21a9e01 100644 (file)
--- a/menu/m_scale.c
+++ b/menu/m_scale.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright (c) 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 +37,7 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_scale.c,v 1.9 2004/12/11 23:29:34 tom Exp $")
+MODULE_ID("$Id: m_scale.c,v 1.10 2010/01/23 21:20:10 tom Exp $")

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


@@ -53,7 +53,10 @@ MODULE_ID("$Id: m_scale.c,v 1.9 2004/12/11 23:29:34 tom Exp $")
 NCURSES_EXPORT(int)
 scale_menu(const MENU * menu, int *rows, int *cols)
 {
 NCURSES_EXPORT(int)
 scale_menu(const MENU * menu, int *rows, int *cols)
 {

-  T((T_CALLED("scale_menu(%p,%p,%p)"), menu, rows, cols));
+  T((T_CALLED("scale_menu(%p,%p,%p)"),
+     (const void *)menu,
+     (void *)rows,
+     (void *)cols));

 
   if (!menu)
     RETURN(E_BAD_ARGUMENT);
 
   if (!menu)
     RETURN(E_BAD_ARGUMENT);

diff --git a/menu/m_spacing.c b/menu/m_spacing.c
index 039bbe4d59b17c7d3e4b9352a2a04c195aa5978f..1cfa2e166571c262bc20cba7c17db32c05234604 100644 (file)
--- a/menu/m_spacing.c
+++ b/menu/m_spacing.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright (c) 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 +37,7 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_spacing.c,v 1.17 2004/12/11 23:29:34 tom Exp $")
+MODULE_ID("$Id: m_spacing.c,v 1.18 2010/01/23 21:20:10 tom Exp $")

 
 #define MAX_SPC_DESC ((TABSIZE) ? (TABSIZE) : 8)
 #define MAX_SPC_COLS ((TABSIZE) ? (TABSIZE) : 8)
 
 #define MAX_SPC_DESC ((TABSIZE) ? (TABSIZE) : 8)
 #define MAX_SPC_COLS ((TABSIZE) ? (TABSIZE) : 8)


@@ -56,7 +56,8 @@ set_menu_spacing(MENU * menu, int s_desc, int s_row, int s_col)
 {
   MENU *m;                     /* split for ATAC workaround */
 
 {
   MENU *m;                     /* split for ATAC workaround */
 

-  T((T_CALLED("set_menu_spacing(%p,%d,%d,%d)"), menu, s_desc, s_row, s_col));
+  T((T_CALLED("set_menu_spacing(%p,%d,%d,%d)"),
+     (void *)menu, s_desc, s_row, s_col));

 
   m = Normalize_Menu(menu);
 
 
   m = Normalize_Menu(menu);
 


@@ -90,7 +91,11 @@ menu_spacing(const MENU * menu, int *s_desc, int *s_row, int *s_col)
 {
   const MENU *m;               /* split for ATAC workaround */
 
 {
   const MENU *m;               /* split for ATAC workaround */
 

-  T((T_CALLED("menu_spacing(%p,%p,%p,%p)"), menu, s_desc, s_row, s_col));
+  T((T_CALLED("menu_spacing(%p,%p,%p,%p)"),
+     (const void *)menu,
+     (void *)s_desc,
+     (void *)s_row,
+     (void *)s_col));

 
   m = Normalize_Menu(menu);
 
 
   m = Normalize_Menu(menu);
 

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

- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright (c) 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 +37,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.12 2010/01/23 21:20:11 tom Exp $")

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


@@ -51,7 +51,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 +93,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));
 }
 

diff --git a/menu/m_trace.c b/menu/m_trace.c
index 0f9f90273a6a3536c470434c2d668b2944a61119..094ff86c67a9e20b969eb8833a3b716cffb0cc04 100644 (file)
--- a/menu/m_trace.c
+++ b/menu/m_trace.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2004,2005 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2004-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,19 +32,19 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_trace.c,v 1.3 2005/01/16 01:06:11 tom Exp $")
+MODULE_ID("$Id: m_trace.c,v 1.4 2010/01/23 21:20:10 tom Exp $")

 
 NCURSES_EXPORT(ITEM *)
 _nc_retrace_item(ITEM * code)
 {
 
 NCURSES_EXPORT(ITEM *)
 _nc_retrace_item(ITEM * code)
 {

-  T((T_RETURN("%p"), code));
+  T((T_RETURN("%p"), (void *)code));

   return code;
 }
 
 NCURSES_EXPORT(ITEM **)
 _nc_retrace_item_ptr(ITEM ** code)
 {
   return code;
 }
 
 NCURSES_EXPORT(ITEM **)
 _nc_retrace_item_ptr(ITEM ** code)
 {

-  T((T_RETURN("%p"), code));
+  T((T_RETURN("%p"), (void *)code));

   return code;
 }
 
   return code;
 }
 


@@ -58,7 +58,7 @@ _nc_retrace_item_opts(Item_Options code)
 NCURSES_EXPORT(MENU *)
 _nc_retrace_menu(MENU * code)
 {
 NCURSES_EXPORT(MENU *)
 _nc_retrace_menu(MENU * code)
 {

-  T((T_RETURN("%p"), code));
+  T((T_RETURN("%p"), (void *)code));

   return code;
 }
 
   return code;
 }
 

diff --git a/menu/m_userptr.c b/menu/m_userptr.c
index 7b178b25a175ba381847fa52a2a4a2190a1a7550..a7359c99d0eb41164b0d839c466e7637f3ce6d17 100644 (file)
--- a/menu/m_userptr.c
+++ b/menu/m_userptr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright (c) 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 +37,7 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_userptr.c,v 1.16 2004/12/25 21:38:55 tom Exp $")
+MODULE_ID("$Id: m_userptr.c,v 1.17 2010/01/23 21:20:10 tom Exp $")

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


@@ -51,7 +51,7 @@ MODULE_ID("$Id: m_userptr.c,v 1.16 2004/12/25 21:38:55 tom Exp $")
 NCURSES_EXPORT(int)
 set_menu_userptr(MENU * menu, void *userptr)
 {
 NCURSES_EXPORT(int)
 set_menu_userptr(MENU * menu, void *userptr)
 {

-  T((T_CALLED("set_menu_userptr(%p,%p)"), menu, userptr));
+  T((T_CALLED("set_menu_userptr(%p,%p)"), (void *)menu, (void *)userptr));

   Normalize_Menu(menu)->userptr = userptr;
   RETURN(E_OK);
 }
   Normalize_Menu(menu)->userptr = userptr;
   RETURN(E_OK);
 }


@@ -69,7 +69,7 @@ set_menu_userptr(MENU * menu, void *userptr)
 NCURSES_EXPORT(void *)
 menu_userptr(const MENU * menu)
 {
 NCURSES_EXPORT(void *)
 menu_userptr(const MENU * menu)
 {

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

   returnVoidPtr(Normalize_Menu(menu)->userptr);
 }
 
   returnVoidPtr(Normalize_Menu(menu)->userptr);
 }
 

diff --git a/menu/m_win.c b/menu/m_win.c
index 28715416ced7ebdaf904517f72aef25dde2dd6ed..d88fa674c6086a9a07d2b6300deb328732d0ee14 100644 (file)
--- a/menu/m_win.c
+++ b/menu/m_win.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
+ * Copyright (c) 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 +37,7 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_win.c,v 1.16 2009/04/05 00:38:22 tom Exp $")
+MODULE_ID("$Id: m_win.c,v 1.17 2010/01/23 21:20:11 tom Exp $")

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


@@ -51,7 +51,7 @@ MODULE_ID("$Id: m_win.c,v 1.16 2009/04/05 00:38:22 tom Exp $")
 NCURSES_EXPORT(int)
 set_menu_win(MENU * menu, WINDOW *win)
 {
 NCURSES_EXPORT(int)
 set_menu_win(MENU * menu, WINDOW *win)
 {

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

 
   if (menu)
     {
 
   if (menu)
     {


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

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

   returnWin(Get_Menu_UserWin(m));
 }
 
   returnWin(Get_Menu_UserWin(m));
 }
 

diff --git a/menu/modules b/menu/modules
index abc4cf0afa4992dd1ebceb5e93b84416dcdfab63..fac8fceba1e494845fd13f34701825fd38f643e9 100644 (file)
--- a/menu/modules
+++ b/menu/modules
@@ -1,6 +1,6 @@
-# $Id: modules,v 1.17 2006/12/24 00:52:39 tom Exp $
+# $Id: modules,v 1.18 2010/01/23 16:36:23 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2006,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 "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -32,32 +32,32 @@
 
 @ base
 # Library objects
 
 @ base
 # Library objects

-m_attribs      lib             $(srcdir)       $(MENU_PRIV_H)
-m_cursor       lib             $(srcdir)       $(MENU_PRIV_H)
-m_driver       lib             $(srcdir)       $(MENU_PRIV_H)
-m_format       lib             $(srcdir)       $(MENU_PRIV_H)
-m_global       lib             $(srcdir)       $(MENU_PRIV_H)
-m_hook         lib             $(srcdir)       $(MENU_PRIV_H)
-m_item_cur     lib             $(srcdir)       $(MENU_PRIV_H)
-m_item_nam     lib             $(srcdir)       $(MENU_PRIV_H)
-m_item_new     lib             $(srcdir)       $(MENU_PRIV_H)
-m_item_opt     lib             $(srcdir)       $(MENU_PRIV_H)
-m_item_top     lib             $(srcdir)       $(MENU_PRIV_H)
-m_item_use     lib             $(srcdir)       $(MENU_PRIV_H)
-m_item_val     lib             $(srcdir)       $(MENU_PRIV_H)
-m_item_vis     lib             $(srcdir)       $(MENU_PRIV_H)
-m_items                lib             $(srcdir)       $(MENU_PRIV_H)
-m_new          lib             $(srcdir)       $(MENU_PRIV_H)
-m_opts         lib             $(srcdir)       $(MENU_PRIV_H)
-m_pad          lib             $(srcdir)       $(MENU_PRIV_H)
-m_pattern      lib             $(srcdir)       $(MENU_PRIV_H)
-m_post         lib             $(srcdir)       $(MENU_PRIV_H)
-m_req_name     lib             $(srcdir)       $(MENU_PRIV_H)
-m_scale                lib             $(srcdir)       $(MENU_PRIV_H)
-m_spacing      lib             $(srcdir)       $(MENU_PRIV_H)
-m_sub          lib             $(srcdir)       $(MENU_PRIV_H)
-m_trace                lib             $(srcdir)       $(MENU_PRIV_H)
-m_userptr      lib             $(srcdir)       $(MENU_PRIV_H)
-m_win          lib             $(srcdir)       $(MENU_PRIV_H)
+m_attribs      lib             $(srcdir)       $(HEADER_DEPS)
+m_cursor       lib             $(srcdir)       $(HEADER_DEPS)
+m_driver       lib             $(srcdir)       $(HEADER_DEPS)
+m_format       lib             $(srcdir)       $(HEADER_DEPS)
+m_global       lib             $(srcdir)       $(HEADER_DEPS)
+m_hook         lib             $(srcdir)       $(HEADER_DEPS)
+m_item_cur     lib             $(srcdir)       $(HEADER_DEPS)
+m_item_nam     lib             $(srcdir)       $(HEADER_DEPS)
+m_item_new     lib             $(srcdir)       $(HEADER_DEPS)
+m_item_opt     lib             $(srcdir)       $(HEADER_DEPS)
+m_item_top     lib             $(srcdir)       $(HEADER_DEPS)
+m_item_use     lib             $(srcdir)       $(HEADER_DEPS)
+m_item_val     lib             $(srcdir)       $(HEADER_DEPS)
+m_item_vis     lib             $(srcdir)       $(HEADER_DEPS)
+m_items                lib             $(srcdir)       $(HEADER_DEPS)
+m_new          lib             $(srcdir)       $(HEADER_DEPS)
+m_opts         lib             $(srcdir)       $(HEADER_DEPS)
+m_pad          lib             $(srcdir)       $(HEADER_DEPS)
+m_pattern      lib             $(srcdir)       $(HEADER_DEPS)
+m_post         lib             $(srcdir)       $(HEADER_DEPS)
+m_req_name     lib             $(srcdir)       $(HEADER_DEPS)
+m_scale                lib             $(srcdir)       $(HEADER_DEPS)
+m_spacing      lib             $(srcdir)       $(HEADER_DEPS)
+m_sub          lib             $(srcdir)       $(HEADER_DEPS)
+m_trace                lib             $(srcdir)       $(HEADER_DEPS)
+m_userptr      lib             $(srcdir)       $(HEADER_DEPS)
+m_win          lib             $(srcdir)       $(HEADER_DEPS)

 
 # vile:makemode
 
 # vile:makemode

diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in
index b0bf05d264ba1a1d5c5d6eb359bd48982e1cd158..3c7044089075faa66b01b43951959731feb60060 100644 (file)
--- a/ncurses/Makefile.in
+++ b/ncurses/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.119 2009/08/10 09:06:37 tom Exp $
+# $Id: Makefile.in,v 1.122 2010/01/23 18:44:34 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.                #
+# Copyright (c) 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 "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -154,6 +154,18 @@ AUTO_SRC = \
        init_keytry.h \
        keys.list
 
        init_keytry.h \
        keys.list
 

+HEADER_DEPS    = \
+       $(srcdir)/curses.priv.h \
+       $(INCDIR)/ncurses_dll.h \
+       $(INCDIR)/ncurses_cfg.h \
+       $(INCDIR)/curses.h \
+       $(INCDIR)/nc_panel.h \
+       $(INCDIR)/term.h \
+       $(INCDIR)/term_entry.h \
+       $(INCDIR)/nc_tparm.h \
+       $(INCDIR)/nc_alloc.h \
+       $(INCDIR)/nc_mingw.h
+

 TEST_DEPS      = ../lib/@LIB_PREFIX@ncurses@DFT_DEP_SUFFIX@
 TEST_ARGS      = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ 
 TEST_LDFLAGS   = @LD_MODEL@ $(TEST_ARGS) @LIBS@ @LOCAL_LDFLAGS@ @LDFLAGS@
 TEST_DEPS      = ../lib/@LIB_PREFIX@ncurses@DFT_DEP_SUFFIX@
 TEST_ARGS      = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ 
 TEST_LDFLAGS   = @LD_MODEL@ $(TEST_ARGS) @LIBS@ @LOCAL_LDFLAGS@ @LDFLAGS@

diff --git a/ncurses/base/MKkeyname.awk b/ncurses/base/MKkeyname.awk
index e487038ddafdf27f2c4e44cd3423c084d5def3ab..abceeea8883eeca8433ee14ae73c568cb3beff34 100644 (file)
--- a/ncurses/base/MKkeyname.awk
+++ b/ncurses/base/MKkeyname.awk
@@ -1,6 +1,6 @@
-# $Id: MKkeyname.awk,v 1.43 2009/05/09 19:01:49 tom Exp $
+# $Id: MKkeyname.awk,v 1.44 2010/01/23 17:57:43 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 1999-2008,2009 Free Software Foundation, Inc.                #
+# Copyright (c) 1999-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 "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -31,7 +31,6 @@ BEGIN {
        print ""
        print "#include <curses.priv.h>"
        print "#include <tic.h>"
        print ""
        print "#include <curses.priv.h>"
        print "#include <tic.h>"

-       print "#include <term_entry.h>"

        print ""
        first = 1;
 }
        print ""
        first = 1;
 }

diff --git a/ncurses/base/lib_freeall.c b/ncurses/base/lib_freeall.c
index 863082173128528d69ee1f5e077b47e07700f32a..5bcc974bc2577d27a03990e29273c4467823fa1f 100644 (file)
--- a/ncurses/base/lib_freeall.c
+++ b/ncurses/base/lib_freeall.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -31,7 +31,6 @@
  ****************************************************************************/
 
 #include <curses.priv.h>
  ****************************************************************************/
 
 #include <curses.priv.h>

-#include <term_entry.h>

 #include <tic.h>
 
 #if HAVE_NC_FREEALL
 #include <tic.h>
 
 #if HAVE_NC_FREEALL


@@ -40,7 +39,7 @@
 extern int malloc_errfd;       /* FIXME */
 #endif
 
 extern int malloc_errfd;       /* FIXME */
 #endif
 

-MODULE_ID("$Id: lib_freeall.c,v 1.58 2009/05/09 18:34:30 tom Exp $")
+MODULE_ID("$Id: lib_freeall.c,v 1.59 2010/01/23 17:57:43 tom Exp $")

 
 /*
  * Free all ncurses data.  This is used for testing only (there's no practical
 
 /*
  * Free all ncurses data.  This is used for testing only (there's no practical

diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 3a61f764e4b1caf474417f501b39a011fdbf52a3..0ef4879548d9cb690dc96a228cf22b3399d5f4b1 100644 (file)
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
 
 
 /*
 
 
 /*

- * $Id: curses.priv.h,v 1.447 2010/01/16 21:32:59 tom Exp $
+ * $Id: curses.priv.h,v 1.450 2010/01/23 22:05:30 tom Exp $

  *
  *     curses.priv.h
  *
  *
  *     curses.priv.h
  *


@@ -61,6 +61,7 @@ extern "C" {
 #define MODULE_ID(id) /*nothing*/
 #endif
 
 #define MODULE_ID(id) /*nothing*/
 #endif
 

+#include <stddef.h>            /* for offsetof */

 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>


@@ -1098,9 +1099,9 @@ extern NCURSES_EXPORT_VAR(SCREEN *) _nc_screen_chain;
 extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
 
        WINDOWLIST {
 extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
 
        WINDOWLIST {

-       WINDOW  win;            /* first, so WINDOW_EXT() works */

        WINDOWLIST *next;
        SCREEN *screen;         /* screen containing the window */
        WINDOWLIST *next;
        SCREEN *screen;         /* screen containing the window */

+       WINDOW  win;            /* WINDOW_EXT() needs to account for offset */

 #ifdef _XOPEN_SOURCE_EXTENDED
        char addch_work[(MB_LEN_MAX * 9) + 1];
        unsigned addch_used;    /* number of bytes in addch_work[] */
 #ifdef _XOPEN_SOURCE_EXTENDED
        char addch_work[(MB_LEN_MAX * 9) + 1];
        unsigned addch_used;    /* number of bytes in addch_work[] */


@@ -1109,7 +1110,7 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
 #endif
 };
 
 #endif
 };
 

-#define WINDOW_EXT(win,field) (((WINDOWLIST *)(win))->field)
+#define WINDOW_EXT(w,m) (((WINDOWLIST *)((char *)(w) - offsetof(WINDOWLIST, win)))->m)

 
 #define SP_PRE_INIT(sp)                         \
     sp->_cursrow = -1;                          \
 
 #define SP_PRE_INIT(sp)                         \
     sp->_cursrow = -1;                          \

diff --git a/ncurses/modules b/ncurses/modules
index 45e767b6659f1eedbd9333ca77ce01d4ff938f83..4466152e893e5712fcdd245ed2928dc1a380070b 100644 (file)
--- a/ncurses/modules
+++ b/ncurses/modules
@@ -1,6 +1,6 @@
-# $Id: modules,v 1.114 2009/07/25 13:53:34 tom Exp $
+# $Id: modules,v 1.116 2010/01/23 18:32:44 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.                #
+# Copyright (c) 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 "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -32,212 +32,212 @@
 
 @ base
 # Library objects
 
 @ base
 # Library objects

-hardscroll     lib             $(serial)
-hashmap                lib             $(serial)       ../include/term.h
-lib_addch      lib             $(base)
-lib_addstr     lib             $(base)
-lib_beep       lib             $(base)         ../include/term.h
-lib_bkgd       lib             $(base)
-lib_box        lib             $(base)
-lib_chgat      lib             $(base)
-lib_clear      lib             $(base)
-lib_clearok    lib             $(base)
-lib_clrbot     lib             $(base)
-lib_clreol     lib             $(base)
-lib_color      lib             $(base)         ../include/term.h
-lib_colorset   lib             $(base)
-lib_delch      lib             $(base)
-lib_delwin     lib             $(base)
-lib_echo       lib             $(base)
-lib_endwin     lib             $(base)         ../include/term.h
-lib_erase      lib             $(base)
-lib_flash      lib             $(base)         ../include/term.h
-lib_gen        lib             .               ../include/curses.h
-lib_getch      lib             $(base)
-lib_getstr     lib             $(base)         ../include/term.h
-lib_hline      lib             $(base)
-lib_immedok    lib             $(base)
-lib_inchstr    lib             $(base)
-lib_initscr    lib             $(base)         $(INCDIR)/tic.h
-lib_insch      lib             $(base)
-lib_insdel     lib             $(base)
-lib_insnstr    lib             $(base)
-lib_instr      lib             $(base)
-lib_isendwin   lib             $(base)
-lib_leaveok    lib             $(base)
-lib_mouse      lib             $(base)         ../include/term.h
-lib_move       lib             $(base)
-lib_mvcur      lib             $(serial)       ../include/term.h $(INCDIR)/tic.h
-lib_mvwin      lib             $(base)
-lib_newterm    lib             $(base)         ../include/term.h
-lib_newwin     lib             $(base)
-lib_nl         lib             $(base)
-lib_overlay    lib             $(base)
-lib_pad        lib             $(base)
-lib_printw     lib             $(base)
-lib_redrawln   lib             $(base)
-lib_refresh    lib             $(base)
-lib_restart    lib             $(base)         ../include/term.h
-lib_scanw      lib             $(base)
-lib_screen     lib             $(base)         ../include/term.h
-lib_scroll     lib             $(base)
-lib_scrollok   lib             $(base)
-lib_scrreg     lib             $(base)
-lib_set_term   lib             $(base)         ../include/term.h
-lib_slk        lib             $(base)         ../include/term.h
-lib_slkatr_set lib             $(base)
-lib_slkatrof   lib             $(base)
-lib_slkatron   lib             $(base)
-lib_slkatrset  lib             $(base)
-lib_slkattr    lib             $(base)
-lib_slkclear   lib             $(base)
-lib_slkcolor   lib             $(base)
-lib_slkinit    lib             $(base)
-lib_slklab     lib             $(base)
-lib_slkrefr    lib             $(base)         ../include/term.h
-lib_slkset     lib             $(base)
-lib_slktouch   lib             $(base)
-lib_touch      lib             $(base)
-lib_tracedmp   lib             $(trace)
-lib_tracemse   lib             $(trace)
-lib_tstp       lib             $(serial)       $(srcdir)/SigAction.h
-lib_ungetch    lib             $(base)
-lib_vidattr    lib             $(serial)       ../include/term.h
-lib_vline      lib             $(base)
-lib_wattroff   lib             $(base)
-lib_wattron    lib             $(base)
-lib_winch      lib             $(base)
-lib_window     lib             $(base)
-link_test      lib             .               ../include/curses.h
-nc_panel       lib             $(base)
-safe_sprintf   lib             $(base)
-tty_update     lib             $(serial)       ../include/term.h
-varargs                lib             $(trace)
+hardscroll     lib             $(serial)       $(HEADER_DEPS)
+hashmap                lib             $(serial)       $(HEADER_DEPS)
+lib_addch      lib             $(base)         $(HEADER_DEPS)
+lib_addstr     lib             $(base)         $(HEADER_DEPS)
+lib_beep       lib             $(base)         $(HEADER_DEPS)
+lib_bkgd       lib             $(base)         $(HEADER_DEPS)
+lib_box        lib             $(base)         $(HEADER_DEPS)
+lib_chgat      lib             $(base)         $(HEADER_DEPS)
+lib_clear      lib             $(base)         $(HEADER_DEPS)
+lib_clearok    lib             $(base)         $(HEADER_DEPS)
+lib_clrbot     lib             $(base)         $(HEADER_DEPS)
+lib_clreol     lib             $(base)         $(HEADER_DEPS)
+lib_color      lib             $(base)         $(HEADER_DEPS)  $(INCDIR)/tic.h
+lib_colorset   lib             $(base)         $(HEADER_DEPS)
+lib_delch      lib             $(base)         $(HEADER_DEPS)
+lib_delwin     lib             $(base)         $(HEADER_DEPS)
+lib_echo       lib             $(base)         $(HEADER_DEPS)
+lib_endwin     lib             $(base)         $(HEADER_DEPS)
+lib_erase      lib             $(base)         $(HEADER_DEPS)
+lib_flash      lib             $(base)         $(HEADER_DEPS)
+lib_gen        lib             .               $(HEADER_DEPS)
+lib_getch      lib             $(base)         $(HEADER_DEPS)  $(srcdir)/fifo_defs.h
+lib_getstr     lib             $(base)         $(HEADER_DEPS)
+lib_hline      lib             $(base)         $(HEADER_DEPS)
+lib_immedok    lib             $(base)         $(HEADER_DEPS)
+lib_inchstr    lib             $(base)         $(HEADER_DEPS)
+lib_initscr    lib             $(base)         $(HEADER_DEPS)
+lib_insch      lib             $(base)         $(HEADER_DEPS)
+lib_insdel     lib             $(base)         $(HEADER_DEPS)
+lib_insnstr    lib             $(base)         $(HEADER_DEPS)
+lib_instr      lib             $(base)         $(HEADER_DEPS)
+lib_isendwin   lib             $(base)         $(HEADER_DEPS)
+lib_leaveok    lib             $(base)         $(HEADER_DEPS)
+lib_mouse      lib             $(base)         $(HEADER_DEPS)  $(INCDIR)/tic.h
+lib_move       lib             $(base)         $(HEADER_DEPS)
+lib_mvcur      lib             $(serial)       $(HEADER_DEPS)  $(INCDIR)/tic.h $(srcdir)/../progs/dump_entry.h
+lib_mvwin      lib             $(base)         $(HEADER_DEPS)
+lib_newterm    lib             $(base)         $(HEADER_DEPS)  $(INCDIR)/tic.h
+lib_newwin     lib             $(base)         $(HEADER_DEPS)
+lib_nl         lib             $(base)         $(HEADER_DEPS)
+lib_overlay    lib             $(base)         $(HEADER_DEPS)
+lib_pad        lib             $(base)         $(HEADER_DEPS)
+lib_printw     lib             $(base)         $(HEADER_DEPS)
+lib_redrawln   lib             $(base)         $(HEADER_DEPS)
+lib_refresh    lib             $(base)         $(HEADER_DEPS)
+lib_restart    lib             $(base)         $(HEADER_DEPS)
+lib_scanw      lib             $(base)         $(HEADER_DEPS)
+lib_screen     lib             $(base)         $(HEADER_DEPS)
+lib_scroll     lib             $(base)         $(HEADER_DEPS)
+lib_scrollok   lib             $(base)         $(HEADER_DEPS)
+lib_scrreg     lib             $(base)         $(HEADER_DEPS)
+lib_set_term   lib             $(base)         $(HEADER_DEPS)  $(INCDIR)/tic.h
+lib_slk        lib             $(base)         $(HEADER_DEPS)
+lib_slkatr_set lib             $(base)         $(HEADER_DEPS)
+lib_slkatrof   lib             $(base)         $(HEADER_DEPS)
+lib_slkatron   lib             $(base)         $(HEADER_DEPS)
+lib_slkatrset  lib             $(base)         $(HEADER_DEPS)
+lib_slkattr    lib             $(base)         $(HEADER_DEPS)
+lib_slkclear   lib             $(base)         $(HEADER_DEPS)
+lib_slkcolor   lib             $(base)         $(HEADER_DEPS)
+lib_slkinit    lib             $(base)         $(HEADER_DEPS)
+lib_slklab     lib             $(base)         $(HEADER_DEPS)
+lib_slkrefr    lib             $(base)         $(HEADER_DEPS)
+lib_slkset     lib             $(base)         $(HEADER_DEPS)
+lib_slktouch   lib             $(base)         $(HEADER_DEPS)
+lib_touch      lib             $(base)         $(HEADER_DEPS)
+lib_tracedmp   lib             $(trace)        $(HEADER_DEPS)
+lib_tracemse   lib             $(trace)        $(HEADER_DEPS)
+lib_tstp       lib             $(serial)       $(HEADER_DEPS)  $(srcdir)/SigAction.h
+lib_ungetch    lib             $(base)         $(HEADER_DEPS)  $(srcdir)/fifo_defs.h
+lib_vidattr    lib             $(serial)       $(HEADER_DEPS)
+lib_vline      lib             $(base)         $(HEADER_DEPS)
+lib_wattroff   lib             $(base)         $(HEADER_DEPS)
+lib_wattron    lib             $(base)         $(HEADER_DEPS)
+lib_winch      lib             $(base)         $(HEADER_DEPS)
+lib_window     lib             $(base)         $(HEADER_DEPS)
+link_test      lib             .               $(HEADER_DEPS)
+nc_panel       lib             $(base)         $(HEADER_DEPS)
+safe_sprintf   lib             $(base)         $(HEADER_DEPS)
+tty_update     lib             $(serial)       $(HEADER_DEPS)
+varargs                lib             $(trace)        $(HEADER_DEPS)

 
 # Modules for porting
 
 # Modules for porting

-memmove                lib             $(base)
-vsscanf        lib             $(base)
+memmove                lib             $(base)         $(HEADER_DEPS)
+vsscanf        lib             $(base)         $(HEADER_DEPS)

 
 # actually an extension, but with its own configure option (--disable-leaks)
 
 # actually an extension, but with its own configure option (--disable-leaks)

-lib_freeall    lib             $(base)
+lib_freeall    lib             $(base)         $(HEADER_DEPS)  $(INCDIR)/tic.h

 
 # XSI extensions to the base library (wide-character)
 @ widechar
 
 # XSI extensions to the base library (wide-character)
 @ widechar

-charable       lib             $(wide)
-lib_add_wch    lib             $(wide)
-lib_box_set    lib             $(wide)
-lib_cchar      lib             $(wide)
-lib_erasewchar lib             $(wide)
-lib_get_wch    lib             $(wide)
-lib_get_wstr   lib             $(wide)
-lib_hline_set  lib             $(wide)
-lib_in_wch     lib             $(wide)
-lib_in_wchnstr lib             $(wide)
-lib_ins_wch    lib             $(wide)
-lib_inwstr     lib             $(wide)
-lib_key_name   lib             $(wide)
-lib_pecho_wchar        lib             $(wide)
-lib_slk_wset   lib             $(wide)
-lib_unget_wch  lib             $(wide)
-lib_vid_attr   lib             $(wide)         ../include/term.h
-lib_vline_set  lib             $(wide)
-lib_wacs       lib             $(wide)
-lib_wunctrl    lib             $(wide)
+charable       lib             $(wide)         $(HEADER_DEPS)
+lib_add_wch    lib             $(wide)         $(HEADER_DEPS)
+lib_box_set    lib             $(wide)         $(HEADER_DEPS)
+lib_cchar      lib             $(wide)         $(HEADER_DEPS)
+lib_erasewchar lib             $(wide)         $(HEADER_DEPS)
+lib_get_wch    lib             $(wide)         $(HEADER_DEPS)
+lib_get_wstr   lib             $(wide)         $(HEADER_DEPS)
+lib_hline_set  lib             $(wide)         $(HEADER_DEPS)
+lib_in_wch     lib             $(wide)         $(HEADER_DEPS)
+lib_in_wchnstr lib             $(wide)         $(HEADER_DEPS)
+lib_ins_wch    lib             $(wide)         $(HEADER_DEPS)
+lib_inwstr     lib             $(wide)         $(HEADER_DEPS)
+lib_key_name   lib             $(wide)         $(HEADER_DEPS)
+lib_pecho_wchar        lib             $(wide)         $(HEADER_DEPS)
+lib_slk_wset   lib             $(wide)         $(HEADER_DEPS)
+lib_unget_wch  lib             $(wide)         $(HEADER_DEPS)
+lib_vid_attr   lib             $(wide)         $(HEADER_DEPS)
+lib_vline_set  lib             $(wide)         $(HEADER_DEPS)
+lib_wacs       lib             $(wide)         $(HEADER_DEPS)
+lib_wunctrl    lib             $(wide)         $(HEADER_DEPS)

 
 # Extensions to the base library
 @ ext_funcs
 
 # Extensions to the base library
 @ ext_funcs

-expanded       lib             .
-legacy_coding  lib             $(base)         ../include/term.h
-lib_dft_fgbg   lib             $(base)         ../include/term.h
-lib_print      lib             $(tinfo)        ../include/term.h
-resizeterm     lib             $(base)         ../include/term.h
-trace_xnames   lib             $(trace)        ../include/term.h $(INCDIR)/term_entry.h
-use_screen     lib             $(tinfo)
-use_window     lib             $(base)
-wresize                lib             $(base)         ../include/term.h
+expanded       lib             .               $(HEADER_DEPS)
+legacy_coding  lib             $(base)         $(HEADER_DEPS)
+lib_dft_fgbg   lib             $(base)         $(HEADER_DEPS)
+lib_print      lib             $(tinfo)        $(HEADER_DEPS)
+resizeterm     lib             $(base)         $(HEADER_DEPS)
+trace_xnames   lib             $(trace)        $(HEADER_DEPS)
+use_screen     lib             $(tinfo)        $(HEADER_DEPS)
+use_window     lib             $(base)         $(HEADER_DEPS)
+wresize                lib             $(base)         $(HEADER_DEPS)

 
 # Support for termcap (and tic, etc.), which can be a separate library
 @ termlib
 
 # Support for termcap (and tic, etc.), which can be a separate library
 @ termlib

-access         lib             $(tinfo)
-add_tries      lib             $(tinfo)
-alloc_ttype    lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
-codes          lib             .
-comp_captab    lib             .               $(INCDIR)/tic.h ../include/term.h ../include/hashsize.h
-comp_error     lib             $(tinfo)        $(INCDIR)/tic.h
-comp_hash      lib             $(tinfo)        ../include/term.h $(INCDIR)/tic.h ../include/hashsize.h
-db_iterator    lib             $(tinfo)        $(INCDIR)/tic.h
-doalloc                lib             $(tinfo)
-entries                lib             $(tinfo)        ../include/term.h $(INCDIR)/tic.h
-fallback       lib             .               ../include/term.h $(INCDIR)/tic.h
-free_ttype     lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
-getenv_num     lib             $(tinfo)
-home_terminfo  lib             $(tinfo)
-init_keytry    lib             $(tinfo)        ../include/term.h $(INCDIR)/tic.h init_keytry.h
-lib_acs        lib             $(tinfo)        ../include/term.h
-lib_baudrate   lib             $(tinfo)        ../include/term.h
-lib_cur_term   lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h
-lib_data       lib             $(tinfo)
-lib_has_cap    lib             $(tinfo)        ../include/term.h
-lib_kernel     lib             $(tinfo)        ../include/term.h
-lib_keyname    lib             .               ../include/term.h
-lib_longname   lib             $(tinfo)
-lib_napms      lib             $(tinfo)
-lib_options    lib             $(tinfo)        ../include/term.h
-lib_raw        lib             $(tinfo)        ../include/term.h
-lib_setup      lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h
-lib_termcap    lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h $(INCDIR)/capdefaults.c
-lib_termname   lib             $(tinfo)        $(INCDIR)/tic.h
-lib_tgoto      lib             $(tinfo)        ../include/term.h $(INCDIR)/tic.h
-lib_ti         lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
-lib_tparm      lib             $(tinfo)        ../include/term.h $(INCDIR)/tic.h
-lib_tputs      lib             $(tinfo)        ../include/term.h $(INCDIR)/tic.h
-lib_trace      lib             $(trace)        $(INCDIR)/tic.h
-lib_traceatr   lib             $(trace)        ../include/term.h
-lib_tracebits  lib             $(trace)        ../include/term.h
-lib_tracechr   lib             $(trace)
-lib_ttyflags   lib             $(tinfo)        ../include/term.h
-lib_twait      lib             $(serial)
-name_match     lib             $(tinfo)        ../include/term.h $(INCDIR)/tic.h
-names          lib             .
-read_entry     lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
-read_termcap   lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
-setbuf         lib             $(tinfo)
-strings                lib             $(tinfo)
-trace_buf      lib             $(trace)
-trace_tries    lib             $(trace)
-tries          lib             $(base)
-trim_sgr0      lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
-unctrl         lib             .
-visbuf         lib             $(trace)        $(INCDIR)/tic.h
+access         lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h
+add_tries      lib             $(tinfo)        $(HEADER_DEPS)
+alloc_ttype    lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h
+codes          lib             .               $(HEADER_DEPS)
+comp_captab    lib             .               $(HEADER_DEPS)  $(INCDIR)/tic.h ../include/hashsize.h
+comp_error     lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h
+comp_hash      lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h ../include/hashsize.h
+db_iterator    lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h
+doalloc                lib             $(tinfo)        $(HEADER_DEPS)
+entries                lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h
+fallback       lib             .               $(HEADER_DEPS)
+free_ttype     lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h
+getenv_num     lib             $(tinfo)        $(HEADER_DEPS)
+home_terminfo  lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h
+init_keytry    lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h init_keytry.h
+lib_acs        lib             $(tinfo)        $(HEADER_DEPS)
+lib_baudrate   lib             $(tinfo)        $(HEADER_DEPS)  ../include/termcap.h
+lib_cur_term   lib             $(tinfo)        $(HEADER_DEPS)  ../include/termcap.h
+lib_data       lib             $(tinfo)        $(HEADER_DEPS)
+lib_has_cap    lib             $(tinfo)        $(HEADER_DEPS)
+lib_kernel     lib             $(tinfo)        $(HEADER_DEPS)
+lib_keyname    lib             .               $(HEADER_DEPS)  $(INCDIR)/tic.h
+lib_longname   lib             $(tinfo)        $(HEADER_DEPS)
+lib_napms      lib             $(tinfo)        $(HEADER_DEPS)
+lib_options    lib             $(tinfo)        $(HEADER_DEPS)
+lib_raw        lib             $(tinfo)        $(HEADER_DEPS)
+lib_setup      lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h
+lib_termcap    lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h ../include/termcap.h $(INCDIR)/capdefaults.c
+lib_termname   lib             $(tinfo)        $(HEADER_DEPS)
+lib_tgoto      lib             $(tinfo)        $(HEADER_DEPS)  ../include/termcap.h
+lib_ti         lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h
+lib_tparm      lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h
+lib_tputs      lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h ../include/termcap.h
+lib_trace      lib             $(trace)        $(HEADER_DEPS)  $(INCDIR)/tic.h
+lib_traceatr   lib             $(trace)        $(HEADER_DEPS)
+lib_tracebits  lib             $(trace)        $(HEADER_DEPS)
+lib_tracechr   lib             $(trace)        $(HEADER_DEPS)
+lib_ttyflags   lib             $(tinfo)        $(HEADER_DEPS)
+lib_twait      lib             $(serial)       $(HEADER_DEPS)
+name_match     lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h
+names          lib             .               $(HEADER_DEPS)
+read_entry     lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h $(INCDIR)/hashed_db.h
+read_termcap   lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h
+setbuf         lib             $(tinfo)        $(HEADER_DEPS)
+strings                lib             $(tinfo)        $(HEADER_DEPS)
+trace_buf      lib             $(trace)        $(HEADER_DEPS)
+trace_tries    lib             $(trace)        $(HEADER_DEPS)
+tries          lib             $(base)         $(HEADER_DEPS)
+trim_sgr0      lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h
+unctrl         lib             .               $(HEADER_DEPS)
+visbuf         lib             $(trace)        $(HEADER_DEPS)  $(INCDIR)/tic.h

 
 # Modules used only for tic, other programs using internal interfaces
 @ ticlib
 
 # Modules used only for tic, other programs using internal interfaces
 @ ticlib

-alloc_entry    lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
-captoinfo      lib             $(tinfo)        $(INCDIR)/tic.h
-comp_expand    lib             $(tinfo)        $(INCDIR)/tic.h
-comp_parse     lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
-comp_scan      lib             $(tinfo)        $(INCDIR)/tic.h
-parse_entry    lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h ../include/parametrized.h $(INCDIR)/capdefaults.c
-write_entry    lib             $(tinfo)        ../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
+alloc_entry    lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h
+captoinfo      lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h
+comp_expand    lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h
+comp_parse     lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h
+comp_scan      lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h
+parse_entry    lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h ../include/parametrized.h
+write_entry    lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h $(INCDIR)/hashed_db.h

 
 # Extensions to the termlib library
 @ ext_tinfo
 
 # Extensions to the termlib library
 @ ext_tinfo

-define_key     lib             $(base)
-hashed_db      lib             $(tinfo)
-key_defined    lib             $(base)
-keybound       lib             $(base)
-keyok          lib             $(base)
-version                lib             $(base)
+define_key     lib             $(base)         $(HEADER_DEPS)
+hashed_db      lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h $(INCDIR)/hashed_db.h
+key_defined    lib             $(base)         $(HEADER_DEPS)
+keybound       lib             $(base)         $(HEADER_DEPS)
+keyok          lib             $(base)         $(HEADER_DEPS)
+version                lib             $(base)         $(HEADER_DEPS)

 
 # Porting
 @ port_drivers
 
 # Porting
 @ port_drivers

-lib_driver      lib             $(base)
+lib_driver      lib             $(base)                $(HEADER_DEPS)

 
 @ port_win32con
 
 @ port_win32con

-gettimeofday   lib             $(win32con)
-win_driver     lib             $(win32con)
+gettimeofday   lib             $(win32con)     $(HEADER_DEPS)
+win_driver     lib             $(win32con)     $(HEADER_DEPS)

 
 @ port_tinfo
 
 @ port_tinfo

-tinfo_driver   lib             $(tinfo)
+tinfo_driver   lib             $(tinfo)        $(HEADER_DEPS)  $(INCDIR)/tic.h

 
 # vile:makemode
 
 # vile:makemode

diff --git a/ncurses/tinfo/MKcodes.awk b/ncurses/tinfo/MKcodes.awk
index 49e2ebc26ce0b6bfea7ef1b5c3204a05775858a3..97e5131ba07ce9d51e76ae8a5045f5ae0bd29d8d 100644 (file)
--- a/ncurses/tinfo/MKcodes.awk
+++ b/ncurses/tinfo/MKcodes.awk
@@ -1,5 +1,5 @@
 ##############################################################################
 ##############################################################################

-# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.                #
+# Copyright (c) 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 "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################

-# $Id: MKcodes.awk,v 1.8 2009/05/23 19:09:54 tom Exp $
+# $Id: MKcodes.awk,v 1.9 2010/01/23 17:57:43 tom Exp $

 function large_item(value) {
        result = sprintf("%d,", offset);
        offset = offset + length(value) + 1;
 function large_item(value) {
        result = sprintf("%d,", offset);
        offset = offset + length(value) + 1;


@@ -101,8 +101,6 @@ END {
                print  ""
                print  "#if BROKEN_LINKER || USE_REENTRANT"
                print  ""
                print  ""
                print  "#if BROKEN_LINKER || USE_REENTRANT"
                print  ""

-               print  "#include <term.h>"
-               print  ""

                if (bigstrings) {
                        printf "static const char _nc_code_blob[] = \n"
                        printf "%s;\n", bigstr;
                if (bigstrings) {
                        printf "static const char _nc_code_blob[] = \n"
                        printf "%s;\n", bigstr;

diff --git a/ncurses/tinfo/access.c b/ncurses/tinfo/access.c
index 08091aa4057bb6cc74c5767cbda275258774b906..87c4f462fd4f05b090c56afe3463a926e1ca2b7f 100644 (file)
--- a/ncurses/tinfo/access.c
+++ b/ncurses/tinfo/access.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -36,9 +36,8 @@
 #include <sys/stat.h>
 
 #include <tic.h>
 #include <sys/stat.h>
 
 #include <tic.h>

-#include <nc_alloc.h>

 
 

-MODULE_ID("$Id: access.c,v 1.15 2009/04/05 00:03:10 tom Exp $")
+MODULE_ID("$Id: access.c,v 1.16 2010/01/23 17:57:43 tom Exp $")

 
 #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
 
 
 #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
 

diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c
index 4638e99c4d58d8eb5a152177e900907f6a5c55bb..5b5325daea8bb25354be5558de3bd3fa0cc6e85d 100644 (file)
--- a/ncurses/tinfo/alloc_entry.c
+++ b/ncurses/tinfo/alloc_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -46,9 +46,8 @@
 #include <curses.priv.h>
 
 #include <tic.h>
 #include <curses.priv.h>
 
 #include <tic.h>

-#include <term_entry.h>

 
 

-MODULE_ID("$Id: alloc_entry.c,v 1.48 2008/08/16 16:25:31 tom Exp $")
+MODULE_ID("$Id: alloc_entry.c,v 1.49 2010/01/23 17:57:43 tom Exp $")

 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2
 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2

diff --git a/ncurses/tinfo/alloc_ttype.c b/ncurses/tinfo/alloc_ttype.c
index 0d147ead7bd88f37afd778002c555fa52abfc949..fa9b095337ba5b81d19ec3bcfe74ff64b4ce61bd 100644 (file)
--- a/ncurses/tinfo/alloc_ttype.c
+++ b/ncurses/tinfo/alloc_ttype.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1999-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1999-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            *


@@ -41,9 +41,8 @@
 #include <curses.priv.h>
 
 #include <tic.h>
 #include <curses.priv.h>
 
 #include <tic.h>

-#include <term_entry.h>

 
 

-MODULE_ID("$Id: alloc_ttype.c,v 1.18 2009/04/18 21:01:38 tom Exp $")
+MODULE_ID("$Id: alloc_ttype.c,v 1.19 2010/01/23 17:57:43 tom Exp $")

 
 #if NCURSES_XNAMES
 /*
 
 #if NCURSES_XNAMES
 /*

diff --git a/ncurses/tinfo/comp_parse.c b/ncurses/tinfo/comp_parse.c
index 938b2c224df5193521a2233213d176ac9a583380..eda581b9fc70d272538173cee0659bd2046b54c3 100644 (file)
--- a/ncurses/tinfo/comp_parse.c
+++ b/ncurses/tinfo/comp_parse.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -51,9 +51,8 @@
 #include <ctype.h>
 
 #include <tic.h>
 #include <ctype.h>
 
 #include <tic.h>

-#include <term_entry.h>

 
 

-MODULE_ID("$Id: comp_parse.c,v 1.71 2009/09/27 14:45:02 tom Exp $")
+MODULE_ID("$Id: comp_parse.c,v 1.72 2010/01/23 17:57:43 tom Exp $")

 
 static void sanity_check2(TERMTYPE *, bool);
 NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE *, bool) = sanity_check2;
 
 static void sanity_check2(TERMTYPE *, bool);
 NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE *, bool) = sanity_check2;

diff --git a/ncurses/tinfo/comp_scan.c b/ncurses/tinfo/comp_scan.c
index ea96a80497b387d799381fd652115060b2f5f475..28ae9e4e87135293679765a375ca1861bab363c4 100644 (file)
--- a/ncurses/tinfo/comp_scan.c
+++ b/ncurses/tinfo/comp_scan.c
@@ -48,10 +48,9 @@
 #include <curses.priv.h>
 
 #include <ctype.h>
 #include <curses.priv.h>
 
 #include <ctype.h>

-#include <term_entry.h>

 #include <tic.h>
 
 #include <tic.h>
 

-MODULE_ID("$Id: comp_scan.c,v 1.85 2010/01/16 17:02:17 tom Exp $")
+MODULE_ID("$Id: comp_scan.c,v 1.86 2010/01/23 17:13:15 tom Exp $")

 
 /*
  * Maximum length of string capability we'll accept before raising an error.
 
 /*
  * Maximum length of string capability we'll accept before raising an error.

diff --git a/ncurses/tinfo/entries.c b/ncurses/tinfo/entries.c
index 5afcbb1d0e8fd93e7227f7216b338480f301d0a5..b1e14a803f313e452c5b314ab91e0610c5418d07 100644 (file)
--- a/ncurses/tinfo/entries.c
+++ b/ncurses/tinfo/entries.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2006-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 2006-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            *


@@ -36,9 +36,8 @@
 #include <ctype.h>
 
 #include <tic.h>
 #include <ctype.h>
 
 #include <tic.h>

-#include <term_entry.h>

 
 

-MODULE_ID("$Id: entries.c,v 1.16 2009/09/27 14:45:02 tom Exp $")
+MODULE_ID("$Id: entries.c,v 1.17 2010/01/23 17:57:43 tom Exp $")

 
 /****************************************************************************
  *
 
 /****************************************************************************
  *

diff --git a/ncurses/tinfo/free_ttype.c b/ncurses/tinfo/free_ttype.c
index fa0fff1b83fbb4cf5e385c99eb1ce53a1446d699..7914fd55e3e5ddcdc3eb23711558fea347f9fd36 100644 (file)
--- a/ncurses/tinfo/free_ttype.c
+++ b/ncurses/tinfo/free_ttype.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -41,9 +41,8 @@
 #include <curses.priv.h>
 
 #include <tic.h>
 #include <curses.priv.h>
 
 #include <tic.h>

-#include <term_entry.h>

 
 

-MODULE_ID("$Id: free_ttype.c,v 1.13 2006/06/25 10:46:02 tom Exp $")
+MODULE_ID("$Id: free_ttype.c,v 1.14 2010/01/23 17:57:43 tom Exp $")

 
 NCURSES_EXPORT(void)
 _nc_free_termtype(TERMTYPE *ptr)
 
 NCURSES_EXPORT(void)
 _nc_free_termtype(TERMTYPE *ptr)

diff --git a/ncurses/tinfo/init_keytry.c b/ncurses/tinfo/init_keytry.c
index dfe859440bd4508a0ae3aae3819c31cfca2c778b..94a6e0c669e2b9a1294d7ba8b4f422ac2a0d4ae6 100644 (file)
--- a/ncurses/tinfo/init_keytry.c
+++ b/ncurses/tinfo/init_keytry.c
@@ -29,9 +29,7 @@
 #include <curses.priv.h>
 #include <tic.h>               /* struct tinfo_fkeys */
 
 #include <curses.priv.h>
 #include <tic.h>               /* struct tinfo_fkeys */
 

-#include <term_entry.h>
-
-MODULE_ID("$Id: init_keytry.c,v 1.15 2010/01/16 17:20:34 tom Exp $")
+MODULE_ID("$Id: init_keytry.c,v 1.16 2010/01/23 17:10:47 tom Exp $")

 
 /*
 **      _nc_init_keytry()
 
 /*
 **      _nc_init_keytry()

diff --git a/ncurses/tinfo/lib_cur_term.c b/ncurses/tinfo/lib_cur_term.c
index 8c933b23c4d7a9477f90299df5d47f5a26098973..f9f7b9cdc1a160a2f7157c22d553f88dd1d6eda3 100644 (file)
--- a/ncurses/tinfo/lib_cur_term.c
+++ b/ncurses/tinfo/lib_cur_term.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 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,10 +37,9 @@
  */
 
 #include <curses.priv.h>
  */
 
 #include <curses.priv.h>

-#include <term_entry.h>                /* TTY, cur_term */

 #include <termcap.h>           /* ospeed */
 
 #include <termcap.h>           /* ospeed */
 

-MODULE_ID("$Id: lib_cur_term.c,v 1.28 2009/10/24 22:15:00 tom Exp $")
+MODULE_ID("$Id: lib_cur_term.c,v 1.29 2010/01/23 17:57:43 tom Exp $")

 
 #undef CUR
 #define CUR termp->type.
 
 #undef CUR
 #define CUR termp->type.

diff --git a/ncurses/tinfo/lib_data.c b/ncurses/tinfo/lib_data.c
index 6537c1503687e56b294cb63af4557baf14f841bf..9c2759345d71f1d95d9999b67865b8be41ef1dca 100644 (file)
--- a/ncurses/tinfo/lib_data.c
+++ b/ncurses/tinfo/lib_data.c
@@ -42,7 +42,7 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_data.c,v 1.57 2009/11/28 22:44:25 tom Exp $")
+MODULE_ID("$Id: lib_data.c,v 1.58 2010/01/23 19:41:58 Miroslav.Lichvar Exp $")

 
 /*
  * OS/2's native linker complains if we don't initialize public data when
 
 /*
  * OS/2's native linker complains if we don't initialize public data when


@@ -260,8 +260,7 @@ _nc_screen_of(WINDOW *win)
     SCREEN *sp = 0;
 
     if (win != 0) {
     SCREEN *sp = 0;
 
     if (win != 0) {

-       WINDOWLIST *wp = (WINDOWLIST *) win;
-       sp = wp->screen;
+       sp = WINDOW_EXT(win, screen);

     }
     return (sp);
 }
     }
     return (sp);
 }

diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index ad06a82423266ed2ef778b913367d6588bb5bdd9..c2a481d7d91150b51e953edb86ac20e7e4eb04e0 100644 (file)
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -42,7 +42,6 @@
 
 #include <curses.priv.h>
 #include <tic.h>               /* for MAX_NAME_SIZE */
 
 #include <curses.priv.h>
 #include <tic.h>               /* for MAX_NAME_SIZE */

-#include <term_entry.h>

 
 #if SVR4_TERMIO && !defined(_POSIX_SOURCE)
 #define _POSIX_SOURCE
 
 #if SVR4_TERMIO && !defined(_POSIX_SOURCE)
 #define _POSIX_SOURCE


@@ -52,7 +51,7 @@
 #include <locale.h>
 #endif
 
 #include <locale.h>
 #endif
 

-MODULE_ID("$Id: lib_setup.c,v 1.126 2009/11/28 22:43:34 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.127 2010/01/23 17:57:43 tom Exp $")

 
 /****************************************************************************
  *
 
 /****************************************************************************
  *

diff --git a/ncurses/tinfo/lib_termcap.c b/ncurses/tinfo/lib_termcap.c
index 893d117d3d28f1778bec1d27ca29ad3d58442f55..bd84a094fb66583317964dd358f3b3ebc7d9d735 100644 (file)
--- a/ncurses/tinfo/lib_termcap.c
+++ b/ncurses/tinfo/lib_termcap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -44,13 +44,11 @@
 #include <tic.h>
 #include <ctype.h>
 
 #include <tic.h>
 #include <ctype.h>
 

-#include <term_entry.h>
-

 #ifndef CUR
 #define CUR SP_TERMTYPE
 #endif
 
 #ifndef CUR
 #define CUR SP_TERMTYPE
 #endif
 

-MODULE_ID("$Id: lib_termcap.c,v 1.71 2009/10/24 21:56:58 tom Exp $")
+MODULE_ID("$Id: lib_termcap.c,v 1.72 2010/01/23 17:57:43 tom Exp $")

 
 NCURSES_EXPORT_VAR(char *) UP = 0;
 NCURSES_EXPORT_VAR(char *) BC = 0;
 
 NCURSES_EXPORT_VAR(char *) UP = 0;
 NCURSES_EXPORT_VAR(char *) BC = 0;

diff --git a/ncurses/tinfo/lib_ti.c b/ncurses/tinfo/lib_ti.c
index bc618cd5623792ae66d34ca2ea885ec0091d6d53..e41234210c85de5993eabf088d26896654e599e1 100644 (file)
--- a/ncurses/tinfo/lib_ti.c
+++ b/ncurses/tinfo/lib_ti.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -34,10 +34,9 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-#include <term_entry.h>

 #include <tic.h>
 
 #include <tic.h>
 

-MODULE_ID("$Id: lib_ti.c,v 1.28 2009/10/24 21:56:58 tom Exp $")
+MODULE_ID("$Id: lib_ti.c,v 1.29 2010/01/23 17:57:43 tom Exp $")

 
 #if 0
 static bool
 
 #if 0
 static bool

diff --git a/ncurses/tinfo/parse_entry.c b/ncurses/tinfo/parse_entry.c
index 6e59775b7bd70831fc54271e8d89670402127057..73c31cb1d59e0b7972e578d96e10e7c3aa48830d 100644 (file)
--- a/ncurses/tinfo/parse_entry.c
+++ b/ncurses/tinfo/parse_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -46,9 +46,8 @@
 
 #include <ctype.h>
 #include <tic.h>
 
 #include <ctype.h>
 #include <tic.h>

-#include <term_entry.h>

 
 

-MODULE_ID("$Id: parse_entry.c,v 1.71 2009/07/11 18:14:21 tom Exp $")
+MODULE_ID("$Id: parse_entry.c,v 1.72 2010/01/23 17:57:43 tom Exp $")

 
 #ifdef LINT
 static short const parametrized[] =
 
 #ifdef LINT
 static short const parametrized[] =

diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c
index b34ed8ddc12822eb9adb09eb03d7a7da89a7343e..170ed456e00a565e9878e7e14db8a5d2b8c38498 100644 (file)
--- a/ncurses/tinfo/read_entry.c
+++ b/ncurses/tinfo/read_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -40,9 +40,8 @@
 #include <hashed_db.h>
 
 #include <tic.h>
 #include <hashed_db.h>
 
 #include <tic.h>

-#include <term_entry.h>

 
 

-MODULE_ID("$Id: read_entry.c,v 1.105 2009/12/06 01:22:26 tom Exp $")
+MODULE_ID("$Id: read_entry.c,v 1.106 2010/01/23 17:57:43 tom Exp $")

 
 #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts))
 
 
 #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts))
 

diff --git a/ncurses/tinfo/read_termcap.c b/ncurses/tinfo/read_termcap.c
index 4596be730a17e6dea667bac34691a290b7904010..b39a5bebaa472dba1223fa98341bcb0a87ae1d43 100644 (file)
--- a/ncurses/tinfo/read_termcap.c
+++ b/ncurses/tinfo/read_termcap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -56,9 +56,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <tic.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <tic.h>

-#include <term_entry.h>

 
 

-MODULE_ID("$Id: read_termcap.c,v 1.73 2009/12/12 20:21:17 tom Exp $")
+MODULE_ID("$Id: read_termcap.c,v 1.74 2010/01/23 17:57:43 tom Exp $")

 
 #if !PURE_TERMINFO
 
 
 #if !PURE_TERMINFO
 

diff --git a/ncurses/tinfo/trim_sgr0.c b/ncurses/tinfo/trim_sgr0.c
index 446679a77f4864b2c5bf1bac06392ae37313273a..4eb4951d02decd65cb8d95d49abee5457eadf225 100644 (file)
--- a/ncurses/tinfo/trim_sgr0.c
+++ b/ncurses/tinfo/trim_sgr0.c
@@ -35,9 +35,8 @@
 #include <ctype.h>
 
 #include <tic.h>
 #include <ctype.h>
 
 #include <tic.h>

-#include <term_entry.h>

 
 

-MODULE_ID("$Id: trim_sgr0.c,v 1.9 2010/01/16 16:45:13 tom Exp $")
+MODULE_ID("$Id: trim_sgr0.c,v 1.10 2010/01/23 17:12:45 tom Exp $")

 
 #undef CUR
 #define CUR tp->
 
 #undef CUR
 #define CUR tp->

diff --git a/ncurses/tinfo/write_entry.c b/ncurses/tinfo/write_entry.c
index 2552eea56df9bcfc5f93de186ff21887c2debf3e..5fca334d5ce5450d2c9d5031d18c46ac3cdc4f9a 100644 (file)
--- a/ncurses/tinfo/write_entry.c
+++ b/ncurses/tinfo/write_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -42,7 +42,6 @@
 #include <sys/stat.h>
 
 #include <tic.h>
 #include <sys/stat.h>
 
 #include <tic.h>

-#include <term_entry.h>

 
 #ifndef S_ISDIR
 #define S_ISDIR(mode) ((mode & S_IFMT) == S_IFDIR)
 
 #ifndef S_ISDIR
 #define S_ISDIR(mode) ((mode & S_IFMT) == S_IFDIR)


@@ -54,7 +53,7 @@
 #define TRACE_OUT(p)           /*nothing */
 #endif
 
 #define TRACE_OUT(p)           /*nothing */
 #endif
 

-MODULE_ID("$Id: write_entry.c,v 1.75 2009/12/05 21:25:01 tom Exp $")
+MODULE_ID("$Id: write_entry.c,v 1.76 2010/01/23 17:57:43 tom Exp $")

 
 static int total_written;
 
 
 static int total_written;
 

diff --git a/ncurses/trace/trace_xnames.c b/ncurses/trace/trace_xnames.c
index 9b0b5920d81455d4d47de9f932275c3538acfbf6..38a48730ccdc2517c3e0393582dbc7155f021eac 100644 (file)
--- a/ncurses/trace/trace_xnames.c
+++ b/ncurses/trace/trace_xnames.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1999,2000 Free Software Foundation, Inc.                   *
+ * Copyright (c) 1999-2000,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            *


@@ -34,12 +34,11 @@
  */
 
 #include <curses.priv.h>
  */
 
 #include <curses.priv.h>

-#include <term_entry.h>

 
 

-MODULE_ID("$Id: trace_xnames.c,v 1.5 2000/12/10 03:02:45 tom Exp $")
+MODULE_ID("$Id: trace_xnames.c,v 1.6 2010/01/23 17:59:27 tom Exp $")

 
 NCURSES_EXPORT(void)
 
 NCURSES_EXPORT(void)

-_nc_trace_xnames(TERMTYPE * tp GCC_UNUSED)
+_nc_trace_xnames(TERMTYPE *tp GCC_UNUSED)

 {
 #ifdef TRACE
 #if NCURSES_XNAMES
 {
 #ifdef TRACE
 #if NCURSES_XNAMES

diff --git a/ncurses/tty/MKexpanded.sh b/ncurses/tty/MKexpanded.sh
index c7741ae7ce210335b18f275674c7873a9a7cb16b..7a5f5993c48777a03833cdd7c81b0560fd999223 100755 (executable)
--- a/ncurses/tty/MKexpanded.sh
+++ b/ncurses/tty/MKexpanded.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 ##############################################################################
 #! /bin/sh
 ##############################################################################

-# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.                #
+# Copyright (c) 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 "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -29,7 +29,7 @@
 #
 # Author: Thomas E. Dickey, 1997-on
 #
 #
 # Author: Thomas E. Dickey, 1997-on
 #

-# $Id: MKexpanded.sh,v 1.16 2009/07/04 16:45:03 tom Exp $
+# $Id: MKexpanded.sh,v 1.17 2010/01/23 17:57:43 tom Exp $

 #
 # Script to generate 'expanded.c', a dummy source that contains functions
 # corresponding to complex macros used in this library.  By making functions,
 #
 # Script to generate 'expanded.c', a dummy source that contains functions
 # corresponding to complex macros used in this library.  By making functions,


@@ -54,7 +54,6 @@ cat <<EOF
 /* generated by MKexpanded.sh */
 #define NEED_NCURSES_CH_T 1
 #include <curses.priv.h>
 /* generated by MKexpanded.sh */
 #define NEED_NCURSES_CH_T 1
 #include <curses.priv.h>

-#include <term.h>

 
 #ifndef CUR
 #define CUR SP_TERMTYPE
 
 #ifndef CUR
 #define CUR SP_TERMTYPE

diff --git a/ncurses/widechar/lib_vid_attr.c b/ncurses/widechar/lib_vid_attr.c
index 46bde8add3ad512cba08920daff2b8b32ce6f16d..edd510ea03d486c46eebf445b500bc527b76d7ae 100644 (file)
--- a/ncurses/widechar/lib_vid_attr.c
+++ b/ncurses/widechar/lib_vid_attr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2002-2007,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 2002-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            *


@@ -31,13 +31,12 @@
  ****************************************************************************/
 
 #include <curses.priv.h>
  ****************************************************************************/
 
 #include <curses.priv.h>

-#include <term.h>

 
 #ifndef CUR
 
 #ifndef CUR

-#define CUR SP_TERMTYPE 
+#define CUR SP_TERMTYPE

 #endif
 
 #endif
 

-MODULE_ID("$Id: lib_vid_attr.c,v 1.11 2009/05/10 00:48:29 tom Exp $")
+MODULE_ID("$Id: lib_vid_attr.c,v 1.12 2010/01/23 17:59:27 tom Exp $")

 
 #define doPut(mode) TPUTS_TRACE(#mode); NCURSES_SP_NAME(tputs)(NCURSES_SP_ARGx mode, 1, outc)
 
 
 #define doPut(mode) TPUTS_TRACE(#mode); NCURSES_SP_NAME(tputs)(NCURSES_SP_ARGx mode, 1, outc)
 

diff --git a/panel/Makefile.in b/panel/Makefile.in
index 321d6b92be0a33f5191fa9d9a028b51d9222c7fd..85808398194903642271701efe866dfa4b87d32b 100644 (file)
--- a/panel/Makefile.in
+++ b/panel/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.54 2009/03/28 18:22:39 Charles.Wilson Exp $
+# $Id: Makefile.in,v 1.55 2010/01/23 16:31:05 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.                #
+# Copyright (c) 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 "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -134,7 +134,7 @@ $(DESTDIR)$(libdir) :
        -rm -f $@
        cp $(srcdir)/panel.h $@
 
        -rm -f $@
        cp $(srcdir)/panel.h $@
 

-PANEL_PRIV_H = \
+HEADER_DEPS = \

        $(srcdir)/panel.priv.h \
        $(srcdir)/panel.h
 
        $(srcdir)/panel.priv.h \
        $(srcdir)/panel.h
 

diff --git a/panel/modules b/panel/modules
index d0f7a796678ff81208ffc263e9a06ae7ff259b4f..cd3f545630f72ffdfb0d329c0b7bd6f30bf4c44f 100644 (file)
--- a/panel/modules
+++ b/panel/modules
@@ -1,6 +1,6 @@
-# $Id: modules,v 1.9 2006/12/24 00:53:17 tom Exp $
+# $Id: modules,v 1.10 2010/01/23 16:31:16 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 1998,2006 Free Software Foundation, Inc.                     #
+# Copyright (c) 1998-2006,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 "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -32,20 +32,20 @@
 
 @ base
 # Library objects
 
 @ base
 # Library objects

-panel          lib             $(srcdir)       $(PANEL_PRIV_H)
-p_above                lib             $(srcdir)       $(PANEL_PRIV_H)
-p_below                lib             $(srcdir)       $(PANEL_PRIV_H)
-p_bottom       lib             $(srcdir)       $(PANEL_PRIV_H)
-p_delete       lib             $(srcdir)       $(PANEL_PRIV_H)
-p_hide         lib             $(srcdir)       $(PANEL_PRIV_H)
-p_hidden       lib             $(srcdir)       $(PANEL_PRIV_H)
-p_move         lib             $(srcdir)       $(PANEL_PRIV_H)
-p_new          lib             $(srcdir)       $(PANEL_PRIV_H)
-p_replace      lib             $(srcdir)       $(PANEL_PRIV_H)
-p_show         lib             $(srcdir)       $(PANEL_PRIV_H)
-p_top          lib             $(srcdir)       $(PANEL_PRIV_H)
-p_update       lib             $(srcdir)       $(PANEL_PRIV_H)
-p_user         lib             $(srcdir)       $(PANEL_PRIV_H)
-p_win          lib             $(srcdir)       $(PANEL_PRIV_H)
+panel          lib             $(srcdir)       $(HEADER_DEPS)
+p_above                lib             $(srcdir)       $(HEADER_DEPS)
+p_below                lib             $(srcdir)       $(HEADER_DEPS)
+p_bottom       lib             $(srcdir)       $(HEADER_DEPS)
+p_delete       lib             $(srcdir)       $(HEADER_DEPS)
+p_hide         lib             $(srcdir)       $(HEADER_DEPS)
+p_hidden       lib             $(srcdir)       $(HEADER_DEPS)
+p_move         lib             $(srcdir)       $(HEADER_DEPS)
+p_new          lib             $(srcdir)       $(HEADER_DEPS)
+p_replace      lib             $(srcdir)       $(HEADER_DEPS)
+p_show         lib             $(srcdir)       $(HEADER_DEPS)
+p_top          lib             $(srcdir)       $(HEADER_DEPS)
+p_update       lib             $(srcdir)       $(HEADER_DEPS)
+p_user         lib             $(srcdir)       $(HEADER_DEPS)
+p_win          lib             $(srcdir)       $(HEADER_DEPS)

 
 # vile:makemode
 
 # vile:makemode

diff --git a/panel/p_above.c b/panel/p_above.c
index 58db0e605b6efc9f1199462c9662f96b85ad26a6..8bbf1bc21cea8f14b4b17bd2e9d8649c78a85ab4 100644 (file)
--- a/panel/p_above.c
+++ b/panel/p_above.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -36,7 +36,7 @@
  */
 #include "panel.priv.h"
 
  */
 #include "panel.priv.h"
 

-MODULE_ID("$Id: p_above.c,v 1.7 2009/04/11 20:03:06 tom Exp $")
+MODULE_ID("$Id: p_above.c,v 1.8 2010/01/23 21:22:15 tom Exp $")

 
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(PANEL *)
 
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(PANEL *)


@@ -67,7 +67,7 @@ panel_above(const PANEL * pan)
 {
   PANEL *result;
 
 {
   PANEL *result;
 

-  T((T_CALLED("panel_above(%p)"), pan));
+  T((T_CALLED("panel_above(%p)"), (const void *)pan));

   if (pan)
     result = pan->above;
   else
   if (pan)
     result = pan->above;
   else

diff --git a/panel/p_below.c b/panel/p_below.c
index bf54ec593ecc9328e51789af6cd2b8bf619762f2..f276ef959da523ccef52b81f9f59050f089e6fa5 100644 (file)
--- a/panel/p_below.c
+++ b/panel/p_below.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -36,7 +36,7 @@
  */
 #include "panel.priv.h"
 
  */
 #include "panel.priv.h"
 

-MODULE_ID("$Id: p_below.c,v 1.7 2009/04/11 20:17:59 tom Exp $")
+MODULE_ID("$Id: p_below.c,v 1.8 2010/01/23 21:22:15 tom Exp $")

 
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(PANEL *)
 
 #if NCURSES_SP_FUNCS
 NCURSES_EXPORT(PANEL *)


@@ -65,7 +65,7 @@ panel_below(const PANEL * pan)
 {
   PANEL *result;
 
 {
   PANEL *result;
 

-  T((T_CALLED("panel_below(%p)"), pan));
+  T((T_CALLED("panel_below(%p)"), (const void *)pan));

   if (pan)
     {
       GetHook(pan);
   if (pan)
     {
       GetHook(pan);

diff --git a/panel/p_bottom.c b/panel/p_bottom.c
index 2a6a2addc52514bfa86afc1732bb488106661d21..db814415375c0f4f226b6d9ac1d8bf30e9ca035f 100644 (file)
--- a/panel/p_bottom.c
+++ b/panel/p_bottom.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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

-MODULE_ID("$Id: p_bottom.c,v 1.12 2008/11/16 00:19:59 juergen Exp $")
+MODULE_ID("$Id: p_bottom.c,v 1.13 2010/01/23 21:22:16 tom Exp $")

 
 NCURSES_EXPORT(int)
 bottom_panel(PANEL * pan)
 {
   int err = OK;
 
 
 NCURSES_EXPORT(int)
 bottom_panel(PANEL * pan)
 {
   int err = OK;
 

-  T((T_CALLED("bottom_panel(%p)"), pan));
+  T((T_CALLED("bottom_panel(%p)"), (void *)pan));

   if (pan)
     {
       GetHook(pan);
   if (pan)
     {
       GetHook(pan);

diff --git a/panel/p_delete.c b/panel/p_delete.c
index 011703f5eadd2ecb0b1b2c6b605beef54ce28342..39b055377c166698746025cc14e6f7c5ec8414fd 100644 (file)
--- a/panel/p_delete.c
+++ b/panel/p_delete.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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

-MODULE_ID("$Id: p_delete.c,v 1.9 2009/04/11 18:58:36 tom Exp $")
+MODULE_ID("$Id: p_delete.c,v 1.10 2010/01/23 21:22:16 tom Exp $")

 
 NCURSES_EXPORT(int)
 del_panel(PANEL * pan)
 {
   int err = OK;
 
 
 NCURSES_EXPORT(int)
 del_panel(PANEL * pan)
 {
   int err = OK;
 

-  T((T_CALLED("del_panel(%p)"), pan));
+  T((T_CALLED("del_panel(%p)"), (void *)pan));

   if (pan)
     {
       dBug(("--> del_panel %s", USER_PTR(pan->user)));
   if (pan)
     {
       dBug(("--> del_panel %s", USER_PTR(pan->user)));

diff --git a/panel/p_hidden.c b/panel/p_hidden.c
index 39b01cee5a31bc40e15793e00631a109e2847432..01b69b91d919f6991bc3f9845ce543787fdafb7f 100644 (file)
--- a/panel/p_hidden.c
+++ b/panel/p_hidden.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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

-MODULE_ID("$Id: p_hidden.c,v 1.8 2009/04/11 19:01:56 tom Exp $")
+MODULE_ID("$Id: p_hidden.c,v 1.9 2010/01/23 21:22:15 tom Exp $")

 
 NCURSES_EXPORT(int)
 panel_hidden(const PANEL * pan)
 {
   int rc = ERR;
 
 
 NCURSES_EXPORT(int)
 panel_hidden(const PANEL * pan)
 {
   int rc = ERR;
 

-  T((T_CALLED("panel_hidden(%p)"), pan));
+  T((T_CALLED("panel_hidden(%p)"), (const void *)pan));

   if (pan)
     {
       GetHook(pan);
   if (pan)
     {
       GetHook(pan);

diff --git a/panel/p_hide.c b/panel/p_hide.c
index efcd00e45706e463c8241ae3566de455be7dda7c..7b780d464e166829869f1b4e330bb6456a42213a 100644 (file)
--- a/panel/p_hide.c
+++ b/panel/p_hide.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2000,2005 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            *


@@ -36,14 +36,14 @@
  */
 #include "panel.priv.h"
 
  */
 #include "panel.priv.h"
 

-MODULE_ID("$Id: p_hide.c,v 1.10 2009/02/07 23:11:45 tom Exp $")
+MODULE_ID("$Id: p_hide.c,v 1.11 2010/01/23 21:22:16 tom Exp $")

 
 NCURSES_EXPORT(int)
 hide_panel(register PANEL * pan)
 {
   int err = ERR;
 
 
 NCURSES_EXPORT(int)
 hide_panel(register PANEL * pan)
 {
   int err = ERR;
 

-  T((T_CALLED("hide_panel(%p)"), pan));
+  T((T_CALLED("hide_panel(%p)"), (void *)pan));

 
   if (pan)
     {
 
   if (pan)
     {

diff --git a/panel/p_move.c b/panel/p_move.c
index a06e86b19989bd7ab479768c638bcc11ec5069d3..adae64583220edb80c886da437e92c04b195ddcc 100644 (file)
--- a/panel/p_move.c
+++ b/panel/p_move.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2008,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,14 +37,14 @@
  */
 #include "panel.priv.h"
 
  */
 #include "panel.priv.h"
 

-MODULE_ID("$Id: p_move.c,v 1.10 2008/11/16 00:19:59 juergen Exp $")
+MODULE_ID("$Id: p_move.c,v 1.11 2010/01/23 21:22:15 tom Exp $")

 
 NCURSES_EXPORT(int)
 move_panel(PANEL * pan, int starty, int startx)
 {
   int rc = ERR;
 
 
 NCURSES_EXPORT(int)
 move_panel(PANEL * pan, int starty, int startx)
 {
   int rc = ERR;
 

-  T((T_CALLED("move_panel(%p,%d,%d)"), pan, starty, startx));
+  T((T_CALLED("move_panel(%p,%d,%d)"), (void *)pan, starty, startx));

 
   if (pan)
     {
 
   if (pan)
     {

diff --git a/panel/p_new.c b/panel/p_new.c
index df2440b40cafc4740bc29e11620b3a6827ec4ece..235336c22f5163a6191e8f8e1a1f106d1115edc0 100644 (file)
--- a/panel/p_new.c
+++ b/panel/p_new.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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

-MODULE_ID("$Id: p_new.c,v 1.15 2009/12/12 18:30:29 tom Exp $")
+MODULE_ID("$Id: p_new.c,v 1.16 2010/01/23 21:22:16 tom Exp $")

 
 #ifdef TRACE
 static char *stdscr_id;
 
 #ifdef TRACE
 static char *stdscr_id;


@@ -95,7 +95,7 @@ new_panel(WINDOW *win)
 
   GetWindowHook(win);
 
 
   GetWindowHook(win);
 

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

 
   if (!win)
     returnPanel(pan);
 
   if (!win)
     returnPanel(pan);

diff --git a/panel/p_replace.c b/panel/p_replace.c
index b4bf6f4a36e66a926e9f4fa31f276f85287a6766..d3733ed22e2f35d261fc2ee1dcb54749413eb13d 100644 (file)
--- a/panel/p_replace.c
+++ b/panel/p_replace.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2000,2005 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            *


@@ -36,14 +36,14 @@
  */
 #include "panel.priv.h"
 
  */
 #include "panel.priv.h"
 

-MODULE_ID("$Id: p_replace.c,v 1.10 2009/02/07 23:11:45 tom Exp $")
+MODULE_ID("$Id: p_replace.c,v 1.11 2010/01/23 21:22:16 tom Exp $")

 
 NCURSES_EXPORT(int)
 replace_panel(PANEL * pan, WINDOW *win)
 {
   int rc = ERR;
 
 
 NCURSES_EXPORT(int)
 replace_panel(PANEL * pan, WINDOW *win)
 {
   int rc = ERR;
 

-  T((T_CALLED("replace_panel(%p,%p)"), pan, win));
+  T((T_CALLED("replace_panel(%p,%p)"), (void *)pan, (void *)win));

 
   if (pan)
     {
 
   if (pan)
     {

diff --git a/panel/p_show.c b/panel/p_show.c
index c517b4b1ca06f41a7eb7eb377fc6cd3ba41787d5..d5b09bd942602d47fdd70a6c03e1105dc09c2138 100644 (file)
--- a/panel/p_show.c
+++ b/panel/p_show.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2000,2005 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            *


@@ -36,14 +36,14 @@
  */
 #include "panel.priv.h"
 
  */
 #include "panel.priv.h"
 

-MODULE_ID("$Id: p_show.c,v 1.12 2009/02/07 23:11:45 tom Exp $")
+MODULE_ID("$Id: p_show.c,v 1.13 2010/01/23 21:22:16 tom Exp $")

 
 NCURSES_EXPORT(int)
 show_panel(PANEL * pan)
 {
   int err = ERR;
 
 
 NCURSES_EXPORT(int)
 show_panel(PANEL * pan)
 {
   int err = ERR;
 

-  T((T_CALLED("show_panel(%p)"), pan));
+  T((T_CALLED("show_panel(%p)"), (void *)pan));

 
   if (pan)
     {
 
   if (pan)
     {

diff --git a/panel/p_top.c b/panel/p_top.c
index 8bd1d9fb3fecf196d8638cc02b178751015cf935..fdcdee9afcdc9365f7431a4188065bc4d5a5d92e 100644 (file)
--- a/panel/p_top.c
+++ b/panel/p_top.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2000,2005 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            *


@@ -36,11 +36,11 @@
  */
 #include "panel.priv.h"
 
  */
 #include "panel.priv.h"
 

-MODULE_ID("$Id: p_top.c,v 1.5 2005/02/19 16:42:23 tom Exp $")
+MODULE_ID("$Id: p_top.c,v 1.6 2010/01/23 21:22:16 tom Exp $")

 
 NCURSES_EXPORT(int)
 top_panel(PANEL * pan)
 {
 
 NCURSES_EXPORT(int)
 top_panel(PANEL * pan)
 {

-  T((T_CALLED("top_panel(%p)"), pan));
+  T((T_CALLED("top_panel(%p)"), (void *)pan));

   returnCode(show_panel(pan));
 }
   returnCode(show_panel(pan));
 }

diff --git a/panel/p_update.c b/panel/p_update.c
index d199e45a37b3af413d120de5b1beadb8b858bf23..a2f45063cf5ce1e98f07a7cfb1c15d39444f9754 100644 (file)
--- a/panel/p_update.c
+++ b/panel/p_update.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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

-MODULE_ID("$Id: p_update.c,v 1.10 2009/04/11 19:48:36 tom Exp $")
+MODULE_ID("$Id: p_update.c,v 1.11 2010/01/23 21:22:16 tom Exp $")

 
 NCURSES_EXPORT(void)
 NCURSES_SP_NAME(update_panels) (NCURSES_SP_DCL0)
 {
   PANEL *pan;
 
 
 NCURSES_EXPORT(void)
 NCURSES_SP_NAME(update_panels) (NCURSES_SP_DCL0)
 {
   PANEL *pan;
 

-  T((T_CALLED("update_panels(%p)"), SP_PARM));
+  T((T_CALLED("update_panels(%p)"), (void *)SP_PARM));

   dBug(("--> update_panels"));
 
   if (SP_PARM)
   dBug(("--> update_panels"));
 
   if (SP_PARM)

diff --git a/panel/p_user.c b/panel/p_user.c
index ffa25f85ae124458ec1b68514625d818d9a6f7e8..deb5bdf7e4c5e1118dd9da4f4876245abafa5f6a 100644 (file)
--- a/panel/p_user.c
+++ b/panel/p_user.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2000,2005 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            *


@@ -36,12 +36,12 @@
  */
 #include "panel.priv.h"
 
  */
 #include "panel.priv.h"
 

-MODULE_ID("$Id: p_user.c,v 1.6 2005/02/19 16:52:44 tom Exp $")
+MODULE_ID("$Id: p_user.c,v 1.8 2010/01/23 23:18:35 tom Exp $")

 
 NCURSES_EXPORT(int)
 set_panel_userptr(PANEL * pan, NCURSES_CONST void *uptr)
 {
 
 NCURSES_EXPORT(int)
 set_panel_userptr(PANEL * pan, NCURSES_CONST void *uptr)
 {

-  T((T_CALLED("set_panel_userptr(%p,%p)"), pan, uptr));
+  T((T_CALLED("set_panel_userptr(%p,%p)"), (void *)pan, (NCURSES_CONST void *)uptr));

   if (!pan)
     returnCode(ERR);
   pan->user = uptr;
   if (!pan)
     returnCode(ERR);
   pan->user = uptr;


@@ -51,6 +51,6 @@ set_panel_userptr(PANEL * pan, NCURSES_CONST void *uptr)
 NCURSES_EXPORT(NCURSES_CONST void *)
 panel_userptr(const PANEL * pan)
 {
 NCURSES_EXPORT(NCURSES_CONST void *)
 panel_userptr(const PANEL * pan)
 {

-  T((T_CALLED("panel_userptr(%p)"), pan));
+  T((T_CALLED("panel_userptr(%p)"), (const void *)pan));

   returnCVoidPtr(pan ? pan->user : (NCURSES_CONST void *)0);
 }
   returnCVoidPtr(pan ? pan->user : (NCURSES_CONST void *)0);
 }

diff --git a/panel/p_win.c b/panel/p_win.c
index e7d2cea8e3feb6ef2bbcc1921da7ce39f8f0e71a..6643d5c2671f68c85f6ce99ae561bfd69c48cc61 100644 (file)
--- a/panel/p_win.c
+++ b/panel/p_win.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2000,2005 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            *


@@ -36,11 +36,11 @@
  */
 #include "panel.priv.h"
 
  */
 #include "panel.priv.h"
 

-MODULE_ID("$Id: p_win.c,v 1.5 2005/02/19 16:44:16 tom Exp $")
+MODULE_ID("$Id: p_win.c,v 1.6 2010/01/23 21:22:15 tom Exp $")

 
 NCURSES_EXPORT(WINDOW *)
 panel_window(const PANEL * pan)
 {
 
 NCURSES_EXPORT(WINDOW *)
 panel_window(const PANEL * pan)
 {

-  T((T_CALLED("panel_window(%p)"), pan));
+  T((T_CALLED("panel_window(%p)"), (const void *)pan));

   returnWin(pan ? pan->win : (WINDOW *)0);
 }
   returnWin(pan ? pan->win : (WINDOW *)0);
 }

diff --git a/panel/panel.c b/panel/panel.c
index 8ef39847b343cc460805be66d27c6c4d5c704882..96cbbab77400f27e68f79c52c6841880611ef35d 100644 (file)
--- a/panel/panel.c
+++ b/panel/panel.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -36,7 +36,7 @@
 /* panel.c -- implementation of panels library, some core routines */
 #include "panel.priv.h"
 
 /* panel.c -- implementation of panels library, some core routines */
 #include "panel.priv.h"
 

-MODULE_ID("$Id: panel.c,v 1.24 2009/04/11 21:29:10 tom Exp $")
+MODULE_ID("$Id: panel.c,v 1.25 2010/01/23 21:22:16 tom Exp $")

 
 /*+-------------------------------------------------------------------------
        _nc_retrace_panel (pan)
 
 /*+-------------------------------------------------------------------------
        _nc_retrace_panel (pan)


@@ -45,7 +45,7 @@ MODULE_ID("$Id: panel.c,v 1.24 2009/04/11 21:29:10 tom Exp $")
 NCURSES_EXPORT(PANEL *)
 _nc_retrace_panel(PANEL * pan)
 {
 NCURSES_EXPORT(PANEL *)
 _nc_retrace_panel(PANEL * pan)
 {

-  T((T_RETURN("%p"), pan));
+  T((T_RETURN("%p"), (void *)pan));

   return pan;
 }
 #endif
   return pan;
 }
 #endif

diff --git a/progs/modules b/progs/modules
index f8258f73262c4071c247ae40205c5f39be95862c..55d7a9fb96944fceb0eab9dcfc69773cdaab1749 100644 (file)
--- a/progs/modules
+++ b/progs/modules
@@ -1,7 +1,7 @@
-# $Id: modules,v 1.15 2009/03/14 18:45:55 tom Exp $
+# $Id: modules,v 1.17 2010/01/23 17:47:23 tom Exp $

 # Program modules (some are in ncurses lib!)
 ##############################################################################
 # Program modules (some are in ncurses lib!)
 ##############################################################################

-# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.                #
+# Copyright (c) 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 "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -34,12 +34,12 @@
 @ base
 clear          progs           $(srcdir)       $(HEADER_DEPS)
 tic            progs           $(srcdir)       $(HEADER_DEPS) transform.h $(srcdir)/dump_entry.h
 @ base
 clear          progs           $(srcdir)       $(HEADER_DEPS)
 tic            progs           $(srcdir)       $(HEADER_DEPS) transform.h $(srcdir)/dump_entry.h

-toe            progs           $(srcdir)       $(HEADER_DEPS)             $(srcdir)/dump_entry.h
+toe            progs           $(srcdir)       $(HEADER_DEPS)             $(INCDIR)/hashed_db.h

 dump_entry     progs           $(srcdir)       $(HEADER_DEPS)             $(srcdir)/dump_entry.h ../include/parametrized.h $(INCDIR)/capdefaults.c termsort.c
 infocmp                progs           $(srcdir)       $(HEADER_DEPS)             $(srcdir)/dump_entry.h
 tabs           progs           $(srcdir)       $(HEADER_DEPS)
 dump_entry     progs           $(srcdir)       $(HEADER_DEPS)             $(srcdir)/dump_entry.h ../include/parametrized.h $(INCDIR)/capdefaults.c termsort.c
 infocmp                progs           $(srcdir)       $(HEADER_DEPS)             $(srcdir)/dump_entry.h
 tabs           progs           $(srcdir)       $(HEADER_DEPS)

-tput           progs           $(srcdir)       $(HEADER_DEPS) transform.h termsort.c
+tput           progs           $(srcdir)       $(HEADER_DEPS) transform.h $(srcdir)/dump_entry.h termsort.c

 tset           progs           $(srcdir)       $(HEADER_DEPS) transform.h $(srcdir)/dump_entry.h ../include/termcap.h
 tset           progs           $(srcdir)       $(HEADER_DEPS) transform.h $(srcdir)/dump_entry.h ../include/termcap.h

-transform      progs           $(srcdir)       $(HEADER_DEPS)
+transform      progs           $(srcdir)       $(HEADER_DEPS) transform.h

 
 # vile:makemode
 
 # vile:makemode

diff --git a/test/modules b/test/modules
index 1528332e2b8ef06971b996f9e2c55766ef9f113f..67c019e771618baeb77ca70a3b9986e2a633d99a 100644 (file)
--- a/test/modules
+++ b/test/modules
@@ -1,6 +1,6 @@
-# $Id: modules,v 1.41 2009/09/12 21:21:06 tom Exp $
+# $Id: modules,v 1.43 2010/01/23 17:51:38 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.                #
+# Copyright (c) 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 "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -41,7 +41,7 @@ clip_printw   progs           $(srcdir)       $(HEADER_DEPS)
 color_set      progs           $(srcdir)       $(HEADER_DEPS)
 demo_altkeys   progs           $(srcdir)       $(HEADER_DEPS)
 demo_defkey    progs           $(srcdir)       $(HEADER_DEPS)
 color_set      progs           $(srcdir)       $(HEADER_DEPS)
 demo_altkeys   progs           $(srcdir)       $(HEADER_DEPS)
 demo_defkey    progs           $(srcdir)       $(HEADER_DEPS)

-demo_forms     progs           $(srcdir)       $(HEADER_DEPS)  ../include/form.h $(srcdir)/edit_field.h
+demo_forms     progs           $(srcdir)       $(HEADER_DEPS)  $(srcdir)/edit_field.h

 demo_keyok     progs           $(srcdir)       $(HEADER_DEPS)
 demo_menus     progs           $(srcdir)       $(HEADER_DEPS)  ../include/menu.h
 demo_panels    progs           $(srcdir)       $(HEADER_DEPS)  ../include/panel.h
 demo_keyok     progs           $(srcdir)       $(HEADER_DEPS)
 demo_menus     progs           $(srcdir)       $(HEADER_DEPS)  ../include/menu.h
 demo_panels    progs           $(srcdir)       $(HEADER_DEPS)  ../include/panel.h


@@ -52,7 +52,7 @@ dots          progs           $(srcdir)       $(HEADER_DEPS)
 dots_mvcur     progs           $(srcdir)       $(HEADER_DEPS)
 echochar       progs           $(srcdir)       $(HEADER_DEPS)
 edit_field     progs           $(srcdir)       $(HEADER_DEPS)  $(srcdir)/edit_field.h
 dots_mvcur     progs           $(srcdir)       $(HEADER_DEPS)
 echochar       progs           $(srcdir)       $(HEADER_DEPS)
 edit_field     progs           $(srcdir)       $(HEADER_DEPS)  $(srcdir)/edit_field.h

-filter         progs           $(srcdir)       $(HEADER_DEPS)  ../include/form.h
+filter         progs           $(srcdir)       $(HEADER_DEPS)

 firework       progs           $(srcdir)       $(HEADER_DEPS)
 firstlast      progs           $(srcdir)       $(HEADER_DEPS)
 foldkeys       progs           $(srcdir)       $(HEADER_DEPS)
 firework       progs           $(srcdir)       $(HEADER_DEPS)
 firstlast      progs           $(srcdir)       $(HEADER_DEPS)
 foldkeys       progs           $(srcdir)       $(HEADER_DEPS)