[Emacs-diffs] master 8ae2142: * xfns.c (x_real_pos_and_offsets): Fix pointer signedness.

[Paul Eggert]

branch: master
commit 8ae2142555b313c6939d7659e9db65431db06837
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    * xfns.c (x_real_pos_and_offsets): Fix pointer signedness.
---
 src/ChangeLog |    4 ++++
 src/xfns.c    |   19 ++++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index e450696..37e6d20 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-26  Paul Eggert  <address@hidden>
+
+       * xfns.c (x_real_pos_and_offsets): Fix pointer signedness.
+
 2015-02-25  Jan Djärv  <address@hidden>
 
        * xterm.h (struct x_output): Remove x_pixels_outer_diff,
diff --git a/src/xfns.c b/src/xfns.c
index afbd460..4fc92c3 100644
--- 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.