aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/xterm.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/xterm.c b/src/xterm.c
index ba719f76897..ef81aa7bb91 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -11141,7 +11141,10 @@ xim_initialize (dpyinfo, resource_name)
11141 XRegisterIMInstantiateCallback (dpyinfo->display, dpyinfo->xrdb, 11141 XRegisterIMInstantiateCallback (dpyinfo->display, dpyinfo->xrdb,
11142 resource_name, EMACS_CLASS, 11142 resource_name, EMACS_CLASS,
11143 xim_instantiate_callback, 11143 xim_instantiate_callback,
11144 (XPointer)xim_inst); 11144 /* Fixme: This is XPointer in
11145 XFree86 but (XPointer *) on
11146 Tru64, at least. */
11147 (XPointer) xim_inst);
11145#else /* not HAVE_X11R6_XIM */ 11148#else /* not HAVE_X11R6_XIM */
11146 dpyinfo->xim = NULL; 11149 dpyinfo->xim = NULL;
11147 xim_open_dpy (dpyinfo, resource_name); 11150 xim_open_dpy (dpyinfo, resource_name);
@@ -11219,7 +11222,7 @@ x_calc_absolute_position (f)
11219 { 11222 {
11220 Window newroot, newparent = 0xdeadbeef; 11223 Window newroot, newparent = 0xdeadbeef;
11221 Window *newchildren; 11224 Window *newchildren;
11222 int nchildren; 11225 unsigned int nchildren;
11223 11226
11224 if (! XQueryTree (FRAME_X_DISPLAY (f), this_window, &newroot, 11227 if (! XQueryTree (FRAME_X_DISPLAY (f), this_window, &newroot,
11225 &newparent, &newchildren, &nchildren)) 11228 &newparent, &newchildren, &nchildren))