X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fmacrotab.c;h=954ab982555f435efee3ed88d5a3555a0c3cd761;hb=064f515651b1e730c60652eaf07f94c22841d475;hp=5bc5b7327daf89772c77de93d7c05c8d6412ae16;hpb=72367fb45badc6ee3fe515b31348266310bff371;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/macrotab.c b/gdb/macrotab.c
index 5bc5b7327d..954ab98255 100644
--- 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)
     ;
 
@@ -445,12 +444,9 @@ macro_include (struct macro_source_file *source,
          should tolerate bad debug info.  So:
 
          First, squawk.  */
-      static struct deprecated_complaint bogus_inclusion_line = {
-        "both `%s' and `%s' allegedly #included at %s:%d", 0, 0
-      };
-
-      complain (&bogus_inclusion_line, 
-                included, (*link)->filename, source->filename, line);
+      complaint (&symfile_complaints,
+		 _("both `%s' and `%s' allegedly #included at %s:%d"), included,
+		 (*link)->filename, source->filename, line);
 
       /* Now, choose a new, unoccupied line number for this
          #inclusion, after the alleged #inclusion line.  */
@@ -707,15 +703,10 @@ check_for_redefinition (struct macro_source_file *source, int line,
 
       if (! same)
         {
-          static struct deprecated_complaint macro_redefined = {
-            "macro `%s' redefined at %s:%d; original definition at %s:%d",
-            0, 0
-          };
-          complain (&macro_redefined,
-                    name,
-                    source->filename, line,
-                    found_key->start_file->filename,
-                    found_key->start_line);
+	  complaint (&symfile_complaints,
+		     _("macro `%s' redefined at %s:%d; original definition at %s:%d"),
+		     name, source->filename, line,
+		     found_key->start_file->filename, found_key->start_line);
         }
 
       return found_key;
@@ -801,12 +792,10 @@ macro_undef (struct macro_source_file *source, int line,
 
       if (key->end_file)
         {
-          static struct deprecated_complaint double_undef = {
-            "macro '%s' is #undefined twice, at %s:%d and %s:%d",
-            0, 0
-          };
-          complain (&double_undef, name, source->filename, line,
-                    key->end_file->filename, key->end_line);
+	  complaint (&symfile_complaints,
+		     _("macro '%s' is #undefined twice, at %s:%d and %s:%d"), name,
+		     source->filename, line, key->end_file->filename,
+		     key->end_line);
         }
 
       /* Whatever the case, wipe out the old ending point, and 
@@ -820,11 +809,9 @@ macro_undef (struct macro_source_file *source, int line,
          has no macro definition in scope is ignored.  So we should
          ignore it too.  */
 #if 0
-      static struct deprecated_complaint no_macro_to_undefine = {
-        "no definition for macro `%s' in scope to #undef at %s:%d",
-        0, 0
-      };
-      complain (&no_macro_to_undefine, name, source->filename, line);
+      complaint (&symfile_complaints,
+		 _("no definition for macro `%s' in scope to #undef at %s:%d"),
+		 name, source->filename, line);
 #endif
     }
 }