summaryrefslogtreecommitdiff
path: root/lwlib
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-04-16 14:23:30 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-04-16 14:23:30 -0700
commitb165261a478678b338c6cac70af59b8d16651c1e (patch)
treee1e10d69bbc0dfc420eb00079413be03d4092612 /lwlib
parent5c5e6a401e4a857aa8747111438797d88641dfef (diff)
downloademacs-b165261a478678b338c6cac70af59b8d16651c1e.tar.gz
* lwlib-utils.c (XtCompositeChildren): Likewise.
Diffstat (limited to 'lwlib')
-rw-r--r--lwlib/ChangeLog1
-rw-r--r--lwlib/lwlib-utils.c2
2 files changed, 2 insertions, 1 deletions
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];