From: Paul Eggert Date: Thu, 28 Jul 2011 21:51:29 +0000 (-0700) Subject: * frame.h (struct frame): Use int, not EMACS_INT, where int works. X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~117 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2f645268752fbbaf6f094dab704fce2c667f7468;p=emacs.git * 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. --- diff --git a/src/ChangeLog b/src/ChangeLog index c46eec626bd..e2b613d03c8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2011-07-28 Paul Eggert + * 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. diff --git a/src/frame.h b/src/frame.h index 8dccfb8540a..3775403810f 100644 --- a/src/frame.h +++ b/src/frame.h @@ -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. */