aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog7
-rw-r--r--gdb/ada-lang.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 97aba93..18c9dfd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,6 +1,13 @@
2012-03-29 Joel Brobecker <brobecker@adacore.com>
Andrey Smirnov <andrew.smirnov@gmail.com>
+ -Wshadow warning fix.
+ * ada-lang.c (ada_lookup_simple_minsym): Rename wild_match local
+ variable into wild_match_p. Adjust code accordingly.
+
+2012-03-29 Joel Brobecker <brobecker@adacore.com>
+ Andrey Smirnov <andrew.smirnov@gmail.com>
+
* ada-valprint.c (ada_val_print_1): Move the code handling
TYPE_CODE_ENUM inside its own lexical block. Declare
variables len and val there, instead of in the function's
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 146401e..1d108af 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -4414,7 +4414,7 @@ ada_lookup_simple_minsym (const char *name)
{
struct objfile *objfile;
struct minimal_symbol *msymbol;
- const int wild_match = should_use_wild_match (name);
+ const int wild_match_p = should_use_wild_match (name);
/* Special case: If the user specifies a symbol name inside package
Standard, do a non-wild matching of the symbol name without
@@ -4428,7 +4428,7 @@ ada_lookup_simple_minsym (const char *name)
ALL_MSYMBOLS (objfile, msymbol)
{
- if (match_name (SYMBOL_LINKAGE_NAME (msymbol), name, wild_match)
+ if (match_name (SYMBOL_LINKAGE_NAME (msymbol), name, wild_match_p)
&& MSYMBOL_TYPE (msymbol) != mst_solib_trampoline)
return msymbol;
}