From 38561778f3c6a6af98355925bcfd5d3c1e39a484 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 21 Jan 2019 14:17:32 -0700 Subject: [PATCH] Rename "lines" parameter in source-cache.h A compile in the TUI somehow had "lines" defined as a macro. This caused a compile error when including source-cache.h after whatever header did that. I tracked this down to a #define in /usr/include/term.h, so I just changed source-cache.h to avoid the clash. gdb/ChangeLog 2019-01-22 Tom Tromey * source-cache.h (class source_cache) : Rename "lines" parameter. --- gdb/ChangeLog | 5 +++++ gdb/source-cache.h | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 44ec0a6..d9d6d40 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2019-01-22 Tom Tromey + * source-cache.h (class source_cache) : Rename "lines" parameter. + +2019-01-22 Tom Tromey + * remote-fileio.h (struct remote_target): Declare. 2019-01-22 Tom Tromey diff --git a/gdb/source-cache.h b/gdb/source-cache.h index b6656e0..dd23266 100644 --- a/gdb/source-cache.h +++ b/gdb/source-cache.h @@ -36,10 +36,10 @@ public: /* Get the source text for the source file in symtab S. FIRST_LINE and LAST_LINE are the first and last lines to return; line numbers are 1-based. If the file cannot be read, false is - returned. Otherwise, LINES is set to the desired text. The + returned. Otherwise, LINES_OUT is set to the desired text. The returned text may include ANSI terminal escapes. */ bool get_source_lines (struct symtab *s, int first_line, - int last_line, std::string *lines); + int last_line, std::string *lines_out); /* Remove all the items from the source cache. */ void clear () @@ -62,12 +62,12 @@ private: source lines are not highlighted. The arguments and return value are as for get_source_lines. */ bool get_plain_source_lines (struct symtab *s, int first_line, - int last_line, std::string *lines); + int last_line, std::string *lines_out); /* A helper function for get_plain_source_lines that extracts the - desired source lines from TEXT, putting them into LINES. The + desired source lines from TEXT, putting them into LINES_OUT. The arguments and return value are as for get_source_lines. */ bool extract_lines (const struct source_text &text, int first_line, - int last_line, std::string *lines); + int last_line, std::string *lines_out); /* The contents of the cache. */ std::vector m_source_map; -- 2.7.4