* frame.h (struct frame): Use int, not EMACS_INT, where int works.

This is for the members text_lines, text_cols, total_lines, total_cols,
where the system imposes an 'int' limit.
This commit is contained in:
Paul Eggert 2011-07-28 14:51:29 -07:00
parent b8898fdae2
commit 2f64526875
2 changed files with 6 additions and 2 deletions

View file

@ -1,5 +1,9 @@
2011-07-28 Paul Eggert <eggert@cs.ucla.edu>
* frame.h (struct frame): Use int, not EMACS_INT, where int works.
This is for the members text_lines, text_cols, total_lines, total_cols,
where the system imposes an 'int' limit.
* frame.c: Integer overflow fixes.
(set_menu_bar_lines, x_set_frame_parameters, x_set_scroll_bar_width)
(x_figure_window_size): Check for integer overflow.

View file

@ -258,11 +258,11 @@ struct frame
/* Size of this frame, excluding fringes, scroll bars etc.,
in units of canonical characters. */
EMACS_INT text_lines, text_cols;
int text_lines, text_cols;
/* Total size of this frame (i.e. its native window), in units of
canonical characters. */
EMACS_INT total_lines, total_cols;
int total_lines, total_cols;
/* New text height and width for pending size change.
0 if no change pending. */