gnus-registry.el: Silence XEmacs byte compiler

[gnu-emacs] / lwlib / lwlib-Xm.c

diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index 55b27b9dab0100c1a31a418683420fe58c547ffd..63668ea65fe6e297eef408969427fd379342fb7f 100644 (file)
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -1,6 +1,6 @@
 /* The lwlib interface to Motif widgets.
 
 /* The lwlib interface to Motif widgets.
 

-Copyright (C) 1994-1997, 1999-2011  Free Software Foundation, Inc.
+Copyright (C) 1994-1997, 1999-2013 Free Software Foundation, Inc.

 Copyright (C) 1992 Lucid, Inc.
 
 This file is part of the Lucid Widget Library.
 Copyright (C) 1992 Lucid, Inc.
 
 This file is part of the Lucid Widget Library.


@@ -16,13 +16,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License

-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */

 
 

-#ifdef HAVE_CONFIG_H

 #include <config.h>
 #include <config.h>

-#endif

 
 #include <unistd.h>
 #include <stdio.h>
 
 #include <unistd.h>
 #include <stdio.h>


@@ -186,9 +182,9 @@ make_destroyed_instance (char* name,
 static void
 free_destroyed_instance (destroyed_instance* instance)
 {
 static void
 free_destroyed_instance (destroyed_instance* instance)
 {

-  free (instance->name);
-  free (instance->type);
-  free (instance);
+  xfree (instance->name);
+  xfree (instance->type);
+  xfree (instance);

 }
 
 \f/* motif utility functions */
 }
 
 \f/* motif utility functions */


@@ -492,7 +488,6 @@ make_menu_in_widget (widget_instance* instance,
   int child_index;
   widget_value* cur;
   Widget button = 0;
   int child_index;
   widget_value* cur;
   Widget button = 0;

-  Widget title = 0;

   Widget menu;
   Arg al [256];
   int ac;
   Widget menu;
   Arg al [256];
   int ac;


@@ -511,7 +506,7 @@ make_menu_in_widget (widget_instance* instance,
   /* Allocate the children array */
   for (num_children = 0, cur = val; cur; num_children++, cur = cur->next)
     ;
   /* Allocate the children array */
   for (num_children = 0, cur = val; cur; num_children++, cur = cur->next)
     ;

-  children = (Widget*)XtMalloc (num_children * sizeof (Widget));
+  children = (Widget*)(void*)XtMalloc (num_children * sizeof (Widget));

 
   /* WIDGET should be a RowColumn.  */
   if (!XmIsRowColumn (widget))
 
   /* WIDGET should be a RowColumn.  */
   if (!XmIsRowColumn (widget))


@@ -556,7 +551,7 @@ make_menu_in_widget (widget_instance* instance,
        {
          ac = 0;
          XtSetArg (al[ac], XmNalignment, XmALIGNMENT_CENTER); ac++;
        {
          ac = 0;
          XtSetArg (al[ac], XmNalignment, XmALIGNMENT_CENTER); ac++;

-         title = button = XmCreateLabel (widget, cur->name, al, ac);
+         button = XmCreateLabel (widget, cur->name, al, ac);

        }
       else if (lw_separator_p (cur->name, &separator, 1))
        {
        }
       else if (lw_separator_p (cur->name, &separator, 1))
        {


@@ -928,13 +923,13 @@ xm_update_one_value (widget_instance* instance,
     }
   else if (class == xmTextWidgetClass)
     {
     }
   else if (class == xmTextWidgetClass)
     {

-      free (val->value);
+      xfree (val->value);

       val->value = XmTextGetString (widget);
       val->edited = True;
     }
   else if (class == xmTextFieldWidgetClass)
     {
       val->value = XmTextGetString (widget);
       val->edited = True;
     }
   else if (class == xmTextFieldWidgetClass)
     {

-      free (val->value);
+      xfree (val->value);

       val->value = XmTextFieldGetString (widget);
       val->edited = True;
     }
       val->value = XmTextFieldGetString (widget);
       val->edited = True;
     }


@@ -959,7 +954,7 @@ xm_update_one_value (widget_instance* instance,
              XtVaGetValues (toggle, XmNset, &set, NULL);
              if (set)
                {
              XtVaGetValues (toggle, XmNset, &set, NULL);
              if (set)
                {

-                 free (val->value);
+                 xfree (val->value);

                  val->value = safe_strdup (XtName (toggle));
                }
            }
                  val->value = safe_strdup (XtName (toggle));
                }
            }


@@ -1020,10 +1015,10 @@ dialog_key_cb (Widget widget,
 {
   KeySym sym = 0;
   Modifiers modif_ret;
 {
   KeySym sym = 0;
   Modifiers modif_ret;

-  
+

   XtTranslateKeycode (event->xkey.display, event->xkey.keycode, 0,
                       &modif_ret, &sym);
   XtTranslateKeycode (event->xkey.display, event->xkey.keycode, 0,
                       &modif_ret, &sym);

-                      
+

   if (sym == osfXK_Cancel)
     {
       Widget w = *((Widget *) closure);
   if (sym == osfXK_Cancel)
     {
       Widget w = *((Widget *) closure);


@@ -1055,7 +1050,7 @@ make_dialog (char* name,
   Widget row;
   Widget icon;
   Widget icon_separator;
   Widget row;
   Widget icon;
   Widget icon_separator;

-  Widget message;
+  Widget message_label;

   Widget value = 0;
   Widget separator;
   Widget button = 0;
   Widget value = 0;
   Widget separator;
   Widget button = 0;


@@ -1269,7 +1264,7 @@ make_dialog (char* name,
   XtSetArg(al[ac], XmNleftWidget, icon); ac++;
   XtSetArg(al[ac], XmNrightAttachment, XmATTACH_FORM); ac++;
   XtSetArg(al[ac], XmNrightOffset, 13); ac++;
   XtSetArg(al[ac], XmNleftWidget, icon); ac++;
   XtSetArg(al[ac], XmNrightAttachment, XmATTACH_FORM); ac++;
   XtSetArg(al[ac], XmNrightOffset, 13); ac++;

-  message = XmCreateLabel (form, "message", al, ac);
+  message_label = XmCreateLabel (form, "message", al, ac);

 
   if (list)
     XtManageChild (value);
 
   if (list)
     XtManageChild (value);


@@ -1281,7 +1276,7 @@ make_dialog (char* name,
     {
       children [i] = value; i++;
     }
     {
       children [i] = value; i++;
     }

-  children [i] = message; i++;
+  children [i] = message_label; i++;

   children [i] = icon; i++;
   children [i] = icon_separator; i++;
   XtManageChildren (children, i);
   children [i] = icon; i++;
   children [i] = icon_separator; i++;
   XtManageChildren (children, i);