ncurses 6.1 - patch 20180203

[ncurses.git] / form / fld_newftyp.c

diff --git a/form/fld_newftyp.c b/form/fld_newftyp.c
index 689eda454fec64460c6063945328557d88a6e0fd..4e5912546b8b4dbadc28f59e210b9d980a2d26f6 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-2010,2016 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            *
@@ -32,7 +32,7 @@
 
 #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.20 2016/01/23 21:32:00 tom Exp $")
 
 static FIELDTYPE default_fieldtype =
 {
@@ -76,14 +76,14 @@ new_fieldtype(bool (*const field_check) (FIELD *, const void *),
 {
   FIELDTYPE *nftyp = (FIELDTYPE *)0;
 
-  T((T_CALLED("new_fieldtype(%p,%p)"), field_check, char_check));
+  T((T_CALLED("new_fieldtype(%p,%p)"), TR_FUNC(field_check), TR_FUNC(char_check)));
   if ((field_check) || (char_check))
     {
       nftyp = typeMalloc(FIELDTYPE, 1);
 
       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;
@@ -118,7 +118,7 @@ new_fieldtype(bool (*const field_check) (FIELD *, const void *),
 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);