* solib-sunos.c (sunos_relocate_main_executable): Remove function.

[deliverable/binutils-gdb.git] / gdb / macrotab.c

diff --git a/gdb/macrotab.c b/gdb/macrotab.c
index 1432847a8e62b78fd6918485cd7c7edd6b3bdb02..56ee2a4c2844d3f8940848b1878d208fa208dbc1 100644 (file)
--- a/gdb/macrotab.c
+++ b/gdb/macrotab.c
@@ -123,7 +123,7 @@ macro_bcache_str (struct macro_table *t, const char *s)
 
 /* Free a possibly bcached object OBJ.  That is, if the macro table T
    has a bcache, it's an error; otherwise, xfree OBJ.  */
-void
+static void
 macro_bcache_free (struct macro_table *t, void *obj)
 {
   gdb_assert (! t->bcache);
@@ -426,11 +426,10 @@ macro_include (struct macro_source_file *source,
   struct macro_source_file **link;
 
   /* Find the right position in SOURCE's `includes' list for the new
-     file.  Scan until we find the first file we shouldn't follow ---
-     which is therefore the file we should directly precede --- or
-     reach the end of the list.  */
+     file.  Skip inclusions at earlier lines, until we find one at the
+     same line or later --- or until the end of the list.  */
   for (link = &source->includes;
-       *link && line < (*link)->included_at_line;
+       *link && (*link)->included_at_line < line;
        link = &(*link)->next_included)
     ;