aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-01-16 23:45:28 -0800
committerPaul Eggert2011-01-16 23:45:28 -0800
commit717c30e0027175fc8bb849728e5c9b4c3e9b2adf (patch)
tree9683aa3e62420d03025ad36e02eb0d49de37acce /src
parent8865d794dcf18371e6a0727588ee92ac76e04856 (diff)
downloademacs-717c30e0027175fc8bb849728e5c9b4c3e9b2adf.tar.gz
emacs-717c30e0027175fc8bb849728e5c9b4c3e9b2adf.zip
* 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 41f6f72c662..ae0ae7fbeb6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
12011-01-17 Paul Eggert <eggert@cs.ucla.edu> 12011-01-17 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * xfns.c (x_real_positions): Fix signedness of local var 'ign'.
4 XGetGeometry wants unsigned int *, not int *, for its last 4 args,
5 so change the type of 'ign' to unsigned int from int.
6
3 * regex.c (analyse_first): Remove unreachable 'continue' statement. 7 * regex.c (analyse_first): Remove unreachable 'continue' statement.
4 8
5 * xterm.h (struct x_display_info): Remove stray semicolon. 9 * xterm.h (struct x_display_info): Remove stray semicolon.
diff --git a/src/xfns.c b/src/xfns.c
index 88a73804a39..bd2387b201e 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -629,7 +629,7 @@ x_real_positions (FRAME_PTR f, int *xptr, int *yptr)
629 if (rc == Success && actual_type == target_type && !x_had_errors_p (dpy) 629 if (rc == Success && actual_type == target_type && !x_had_errors_p (dpy)
630 && actual_size == 4 && actual_format == 32) 630 && actual_size == 4 && actual_format == 32)
631 { 631 {
632 int ign; 632 unsigned int ign;
633 Window rootw; 633 Window rootw;
634 long *fe = (long *)tmp_data; 634 long *fe = (long *)tmp_data;
635 635
@@ -759,7 +759,7 @@ x_set_tool_bar_position (struct frame *f,
759 if (EQ (new_value, old_value)) return; 759 if (EQ (new_value, old_value)) return;
760 760
761#ifdef USE_GTK 761#ifdef USE_GTK
762 if (xg_change_toolbar_position (f, new_value)) 762 if (xg_change_toolbar_position (f, new_value))
763 f->tool_bar_position = new_value; 763 f->tool_bar_position = new_value;
764#endif 764#endif
765} 765}
@@ -3513,7 +3513,7 @@ This function is an internal primitive--use `make-frame' instead. */)
3513 } 3513 }
3514 3514
3515 BLOCK_INPUT; 3515 BLOCK_INPUT;
3516 3516
3517 /* Set machine name and pid for the purpose of window managers. */ 3517 /* Set machine name and pid for the purpose of window managers. */
3518 set_machine_and_pid_properties(f); 3518 set_machine_and_pid_properties(f);
3519 3519
@@ -5068,7 +5068,7 @@ Text larger than the specified size is clipped. */)
5068#ifdef USE_GTK 5068#ifdef USE_GTK
5069 if (x_gtk_use_system_tooltips) 5069 if (x_gtk_use_system_tooltips)
5070 { 5070 {
5071 int ok; 5071 int ok;
5072 5072
5073 /* Hide a previous tip, if any. */ 5073 /* Hide a previous tip, if any. */
5074 Fx_hide_tip (); 5074 Fx_hide_tip ();
@@ -6104,4 +6104,3 @@ When using Gtk+ tooltips, the tooltip face is not used. */);
6104} 6104}
6105 6105
6106#endif /* HAVE_X_WINDOWS */ 6106#endif /* HAVE_X_WINDOWS */
6107