* xfns.c (x_real_pos_and_offsets): Fix pointer signedness.

8ae21425 · Paul Eggert · 4f9befb3 · 8ae21425 · 8ae21425
Commit 8ae21425 authored Feb 25, 2015 by Paul Eggert
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 9 deletions

src/ChangeLog src/ChangeLog +4 -0

src/xfns.c src/xfns.c +10 -9

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2015-02-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* xfns.c (x_real_pos_and_offsets): Fix pointer signedness.
+
 2015-02-25  Jan Djärv  <jan.h.d@swipnet.se>

 	* xterm.h (struct x_output): Remove x_pixels_outer_diff,

--- a/src/xfns.c
+++ b/src/xfns.c
@@ -334,15 +334,16 @@ x_real_pos_and_offsets (struct frame *f,
  if (yptr) *yptr = real_y;

  if (right_offset_x || bottom_offset_y)
-  {
-    unsigned int ign, fw, fh;
-    Window rootw;
-
-    XGetGeometry (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
-                  &rootw, &ign, &ign, &fw, &fh, &ign, &ign);
-    if (right_offset_x) *right_offset_x = ow - fw + outer_x;
-    if (bottom_offset_y) *bottom_offset_y = oh - fh + outer_y;
-  }
+    {
+      int xy_ign;
+      unsigned int ign, fw, fh;
+      Window rootw;
+
+      XGetGeometry (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
+		    &rootw, &xy_ign, &xy_ign, &fw, &fh, &ign, &ign);
+      if (right_offset_x) *right_offset_x = ow - fw + outer_x;
+      if (bottom_offset_y) *bottom_offset_y = oh - fh + outer_y;
+    }
 }

 /* Store the screen positions of frame F into XPTR and YPTR.