[Emacs-diffs] /srv/bzr/emacs/trunk r102877: * xfns.c (x_real_positions): Fix signedness of local var 'ign'.

[Paul Eggert]

------------------------------------------------------------
revno: 102877 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2011-01-16 23:46:36 -0800
message:
  * xfns.c (x_real_positions): Fix signedness of local var 'ign'.
modified:
  src/ChangeLog
  src/xfns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-01-17 07:34:14 +0000
+++ b/src/ChangeLog     2011-01-17 07:45:28 +0000
@@ -1,5 +1,9 @@
 2011-01-17  Paul Eggert  <address@hidden>
 
+       * xfns.c (x_real_positions): Fix signedness of local var 'ign'.
+       XGetGeometry wants unsigned int *, not int *, for its last 4 args,
+       so change the type of 'ign' to unsigned int from int.
+
        * regex.c (analyse_first): Remove unreachable 'continue' statement.
 
        * xterm.h (struct x_display_info): Remove stray semicolon.

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2011-01-16 02:21:30 +0000
+++ b/src/xfns.c        2011-01-17 07:45:28 +0000
@@ -629,7 +629,7 @@
       if (rc == Success && actual_type == target_type && !x_had_errors_p (dpy)
           && actual_size == 4 && actual_format == 32)
         {
-          int ign;
+          unsigned int ign;
           Window rootw;
           long *fe = (long *)tmp_data;
 
@@ -759,7 +759,7 @@
   if (EQ (new_value, old_value)) return;
 
 #ifdef USE_GTK
-  if (xg_change_toolbar_position (f, new_value)) 
+  if (xg_change_toolbar_position (f, new_value))
     f->tool_bar_position = new_value;
 #endif
 }
@@ -3513,7 +3513,7 @@
     }
 
   BLOCK_INPUT;
-                       
+
   /* Set machine name and pid for the purpose of window managers.  */
   set_machine_and_pid_properties(f);
 
@@ -5068,7 +5068,7 @@
 #ifdef USE_GTK
   if (x_gtk_use_system_tooltips)
     {
-      int ok; 
+      int ok;
 
       /* Hide a previous tip, if any.  */
       Fx_hide_tip ();
@@ -6104,4 +6104,3 @@
 }
 
 #endif /* HAVE_X_WINDOWS */
-