From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 16 Apr 2011 21:23:30 +0000 (-0700)
Subject: * lwlib-utils.c (XtCompositeChildren): Likewise.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~268^2~14
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b165261a478678b338c6cac70af59b8d16651c1e;p=emacs.git

* lwlib-utils.c (XtCompositeChildren): Likewise.
---

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index fd9b10d243c..91f79536a42 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -2,6 +2,7 @@
 
 	* lwlib-Xm.c (make_dialog): Rename local to avoid shadowing.
 	(make_menu_in_widget): Add cast to avoid warning.
+	* lwlib-utils.c (XtCompositeChildren): Likewise.
 
 	* lwlib.c (EXPLAIN, destroy_one_instance): Avoid "else;".
 	(first_child) [USE_MOTIF]: Protoize.
diff --git a/lwlib/lwlib-utils.c b/lwlib/lwlib-utils.c
index c590270a2af..7a0dd1b264a 100644
--- a/lwlib/lwlib-utils.c
+++ b/lwlib/lwlib-utils.c
@@ -129,7 +129,7 @@ XtCompositeChildren (Widget widget, unsigned int *number)
       return NULL;
     }
   n = cw->composite.num_children;
-  result = (Widget*)XtMalloc (n * sizeof (Widget));
+  result = (Widget*)(void*)XtMalloc (n * sizeof (Widget));
   *number = n;
   for (i = 0; i < n; i++)
     result [i] = cw->composite.children [i];