From aaee5dd32d93ad9c08f8ec70515d6996ed9f98ac Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Tue, 11 Dec 2018 16:48:45 +0100 Subject: [PATCH] Rename "lines" for netbsd's benefit Netbsd's curses does a bit of a landgrab, and takes the names "lines" and "newline" and a few others for itself. --- src/builtin.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/builtin.cpp b/src/builtin.cpp index 6a7dd487d..2e3306f94 100644 --- a/src/builtin.cpp +++ b/src/builtin.cpp @@ -200,11 +200,11 @@ void builtin_print_help(parser_t &parser, io_streams_t &streams, const wchar_t * bool is_short = false; if (is_stderr) { // Interactive mode help to screen - only print synopsis if the rest won't fit. - int screen_height, lines; + int screen_height, my_lines; screen_height = common_get_height(); - lines = count_char(str, L'\n'); - if (!shell_is_interactive() || (lines > 2 * screen_height / 3)) { + my_lines = count_char(str, L'\n'); + if (!shell_is_interactive() || (my_lines > 2 * screen_height / 3)) { wchar_t *pos; int cut = 0; int i;