Fix typo in gdb.python/py-objfile.exp

[deliverable/binutils-gdb.git] / gdb / ada-exp.y

diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y
index 96188acb0753c04228951a17fa913e3221111897..9c0caced86ac619aabbb494de04a0c19ea8e0f92 100644 (file)
--- a/gdb/ada-exp.y
+++ b/gdb/ada-exp.y
@@ -1,5 +1,5 @@
 /* YACC parser for Ada expressions, for GDB.
-   Copyright (C) 1986-2014 Free Software Foundation, Inc.
+   Copyright (C) 1986-2015 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -36,7 +36,6 @@
 %{
 
 #include "defs.h"
-#include <string.h>
 #include <ctype.h>
 #include "expression.h"
 #include "value.h"
@@ -1034,7 +1033,7 @@ block_lookup (const struct block *context, const char *raw_name)
     symtab = NULL;
 
   if (symtab != NULL)
-    return BLOCKVECTOR_BLOCK (BLOCKVECTOR (symtab), STATIC_BLOCK);
+    return BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (symtab), STATIC_BLOCK);
   else if (nsyms == 0 || SYMBOL_CLASS (syms[0].sym) != LOC_BLOCK)
     {
       if (context == NULL)
@@ -1087,9 +1086,9 @@ static struct type*
 find_primitive_type (struct parser_state *par_state, char *name)
 {
   struct type *type;
-  type = language_lookup_primitive_type_by_name (parse_language (par_state),
-                                                parse_gdbarch (par_state),
-                                                name);
+  type = language_lookup_primitive_type (parse_language (par_state),
+                                        parse_gdbarch (par_state),
+                                        name);
   if (type == NULL && strcmp ("system__address", name) == 0)
     type = type_system_address (par_state);
 
@@ -1526,9 +1525,9 @@ static struct type *
 type_system_address (struct parser_state *par_state)
 {
   struct type *type 
-    = language_lookup_primitive_type_by_name (parse_language (par_state),
-                                             parse_gdbarch (par_state),
-                                             "system__address");
+    = language_lookup_primitive_type (parse_language (par_state),
+                                     parse_gdbarch (par_state),
+                                     "system__address");
   return  type != NULL ? type : parse_type (par_state)->builtin_data_ptr;
 }