ncurses 5.9 - patch 20140322

[ncurses.git] / form / fld_ftlink.c

diff --git a/form/fld_ftlink.c b/form/fld_ftlink.c
index 4ed2219262aa4405f0bc9858f81f77e3d47d5690..e7b1440ac538a93058b0b25b96295c0e7f1ac180 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-2010,2012 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_ftlink.c,v 1.13 2007/10/13 19:30:35 tom Exp $")
+MODULE_ID("$Id: fld_ftlink.c,v 1.15 2012/06/10 00:27:49 tom Exp $")
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnform  
@@ -53,20 +53,20 @@ link_fieldtype(FIELDTYPE *type1, FIELDTYPE *type2)
 {
   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)
        {
-         T((T_CREATE("fieldtype %p"), nftyp));
+         T((T_CREATE("fieldtype %p"), (void *)nftyp));
          *nftyp = *_nc_Default_FieldType;
-         nftyp->status |= _LINKED_TYPE;
+         SetStatus(nftyp, _LINKED_TYPE);
          if ((type1->status & _HAS_ARGS) || (type2->status & _HAS_ARGS))
-           nftyp->status |= _HAS_ARGS;
+           SetStatus(nftyp, _HAS_ARGS);
          if ((type1->status & _HAS_CHOICE) || (type2->status & _HAS_CHOICE))
-           nftyp->status |= _HAS_CHOICE;
+           SetStatus(nftyp, _HAS_CHOICE);
          nftyp->left = type1;
          nftyp->right = type2;
          type1->ref++;