From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 26 Feb 2015 04:43:25 +0000 (-0800)
Subject: * xfns.c (x_real_pos_and_offsets): Fix pointer signedness.
X-Git-Tag: emacs-25.0.90~2564^2~287
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8ae2142555b313c6939d7659e9db65431db06837;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index e4506968baa..37e6d20eb83 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+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,
diff --git a/src/xfns.c b/src/xfns.c
index afbd460b7c8..4fc92c3fed2 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.