* utils.c (init_page_info): Move declarations of `rows' and

`cols' before the __GO32__-specific code.  Move the closing brace
	outside the #ifdef __GO32__..#endif block.
	[__GO32__]: Use `rows' and `cols' to avoid compiler warnings.
This commit is contained in:
Eli Zaretskii 2004-01-21 18:46:23 +00:00
parent 5843504f37
commit ec14596596
2 changed files with 14 additions and 5 deletions

View File

@ -1,3 +1,10 @@
2004-01-21 Eli Zaretskii <eliz@gnu.org>
* utils.c (init_page_info): Move declarations of `rows' and
`cols' before the __GO32__-specific code. Move the closing brace
outside the #ifdef __GO32__..#endif block.
[__GO32__]: Use `rows' and `cols' to avoid compiler warnings.
2004-01-21 Paul Brook <paul@codesourcery.com>
* infrun.c (handle_inferior_event): Check stop_stack_dummy if handling

View File

@ -1582,12 +1582,14 @@ init_page_info (void)
if (!tui_get_command_dimension (&chars_per_line, &lines_per_page))
#endif
{
#if defined(__GO32__)
lines_per_page = ScreenRows ();
chars_per_line = ScreenCols ();
#else
int rows, cols;
#if defined(__GO32__)
rows = ScreenRows ();
cols = ScreenCols ();
lines_per_page = rows;
chars_per_line = cols;
#else
/* Make sure Readline has initialized its terminal settings. */
rl_reset_terminal (NULL);
@ -1613,8 +1615,8 @@ init_page_info (void)
/* If the output is not a terminal, don't paginate it. */
if (!ui_file_isatty (gdb_stdout))
lines_per_page = UINT_MAX;
}
#endif
}
set_screen_size ();
set_width ();