bfd/

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

diff --git a/gdb/macrotab.c b/gdb/macrotab.c
index 1432847a8e62b78fd6918485cd7c7edd6b3bdb02..954ab982555f435efee3ed88d5a3555a0c3cd761 100644 (file)
--- a/gdb/macrotab.c
+++ b/gdb/macrotab.c
@@ -1,5 +1,5 @@
 /* C preprocessor macro tables for GDB.
-   Copyright 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2007 Free Software Foundation, Inc.
    Contributed by Red Hat, Inc.
 
    This file is part of GDB.
@@ -16,8 +16,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #include "defs.h"
 #include "gdb_obstack.h"
@@ -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)
     ;
 
@@ -446,7 +445,7 @@ macro_include (struct macro_source_file *source,
 
          First, squawk.  */
       complaint (&symfile_complaints,
-                "both `%s' and `%s' allegedly #included at %s:%d", included,
+                _("both `%s' and `%s' allegedly #included at %s:%d"), included,
                 (*link)->filename, source->filename, line);
 
       /* Now, choose a new, unoccupied line number for this
@@ -705,7 +704,7 @@ check_for_redefinition (struct macro_source_file *source, int line,
       if (! same)
         {
          complaint (&symfile_complaints,
-                    "macro `%s' redefined at %s:%d; original definition at %s:%d",
+                    _("macro `%s' redefined at %s:%d; original definition at %s:%d"),
                     name, source->filename, line,
                     found_key->start_file->filename, found_key->start_line);
         }
@@ -794,7 +793,7 @@ macro_undef (struct macro_source_file *source, int line,
       if (key->end_file)
         {
          complaint (&symfile_complaints,
-                    "macro '%s' is #undefined twice, at %s:%d and %s:%d", name,
+                    _("macro '%s' is #undefined twice, at %s:%d and %s:%d"), name,
                     source->filename, line, key->end_file->filename,
                     key->end_line);
         }
@@ -811,7 +810,7 @@ macro_undef (struct macro_source_file *source, int line,
          ignore it too.  */
 #if 0
       complaint (&symfile_complaints,
-                "no definition for macro `%s' in scope to #undef at %s:%d",
+                _("no definition for macro `%s' in scope to #undef at %s:%d"),
                 name, source->filename, line);
 #endif
     }