Mercurial > emacs
changeset 112295:2108d829c749
* 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.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Sun, 16 Jan 2011 23:45:28 -0800 |
| parents | e72732ba15db |
| children | 4249a8552faf 47cb827a3b2a |
| files | src/ChangeLog src/xfns.c |
| diffstat | 2 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Jan 16 23:34:14 2011 -0800 +++ b/src/ChangeLog Sun Jan 16 23:45:28 2011 -0800 @@ -1,5 +1,9 @@ 2011-01-17 Paul Eggert <eggert@cs.ucla.edu> + * 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.
--- a/src/xfns.c Sun Jan 16 23:34:14 2011 -0800 +++ b/src/xfns.c Sun Jan 16 23:45:28 2011 -0800 @@ -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 */ -