aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert <[email protected]>2011-01-16 23:45:28 -0800
committerPaul Eggert <[email protected]>2011-01-16 23:45:28 -0800
commit717c30e0027175fc8bb849728e5c9b4c3e9b2adf (patch)
tree9683aa3e62420d03025ad36e02eb0d49de37acce /src
parent8865d794dcf18371e6a0727588ee92ac76e04856 (diff)
* 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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xfns.c9
2 files changed, 8 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 41f6f72c66..ae0ae7fbeb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
2011-01-17 Paul Eggert <[email protected]>
+ * 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.
diff --git a/src/xfns.c b/src/xfns.c
index 88a73804a3..bd2387b201 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -629,7 +629,7 @@ x_real_positions (FRAME_PTR f, int *xptr, int *yptr)
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 @@ x_set_tool_bar_position (struct frame *f,
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 @@ This function is an internal primitive--use `make-frame' instead. */)
}
BLOCK_INPUT;
-
+
/* Set machine name and pid for the purpose of window managers. */
set_machine_and_pid_properties(f);
@@ -5068,7 +5068,7 @@ Text larger than the specified size is clipped. */)
#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 @@ When using Gtk+ tooltips, the tooltip face is not used. */);
}
#endif /* HAVE_X_WINDOWS */
-