* ada-tasks.c (find_function_in_inferior): Don't declare it.

	("regcache.h"): Include it.
	* ada-lex.l (block_lookup): Replace VAR_NAMESPACE with VAR_DOMAIN.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dfae4df12ed205c4999ab577fc311d83a398336f..f6bef9150efda2ddda4e6a904c34eb8d7e2dbd15 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-17  Stephane Carrez  <stcarrez@nerim.fr>
+
+       * ada-tasks.c (find_function_in_inferior): Don't declare it.
+       ("regcache.h"): Include it.
+       * ada-lex.l (block_lookup): Replace VAR_NAMESPACE with VAR_DOMAIN.
+
 2003-06-17  Daniel Jacobowitz  <drow@mvista.com>
 
         * NEWS: Mention gdbserver detach change and "disconnect" command.

diff --git a/gdb/ada-lex.l b/gdb/ada-lex.l
index 2252d526a52cf33bbe478ea5670e24125a9b74c3..d8bc78952bf780418e92fddb48709afe7825d9e0 100644 (file)
--- a/gdb/ada-lex.l
+++ b/gdb/ada-lex.l
@@ -627,7 +627,7 @@ block_lookup (name, err_name)
   int nsyms;
   struct symtab *symtab;
   nsyms = ada_lookup_symbol_list (name, left_block_context,
-                                 VAR_NAMESPACE, &syms, &blocks);
+                                 VAR_DOMAIN, &syms, &blocks);
   if (left_block_context == NULL &&
       (nsyms == 0 || SYMBOL_CLASS (syms[0]) != LOC_BLOCK))
     symtab = lookup_symtab (name);
@@ -652,7 +652,7 @@ block_lookup (name, err_name)
     }
 }
 
-/* Look up NAME0 (assumed to be mangled) as a name in VAR_NAMESPACE,
+/* Look up NAME0 (assumed to be mangled) as a name in VAR_DOMAIN,
    setting *TOKEN_TYPE to NAME or TYPENAME, depending on what is
    found.  Try first the entire name, then the name without the last 
    segment (i.e., after the last .id), etc., and return the number of
@@ -685,10 +685,10 @@ name_lookup (name0, err_name, token_type)
 
       if (left_block_context == NULL) 
        nsyms = ada_lookup_symbol_list (name, expression_context_block, 
-                                       VAR_NAMESPACE, &syms, &blocks);
+                                       VAR_DOMAIN, &syms, &blocks);
       else
        nsyms = ada_lookup_symbol_list (name, left_block_context, 
-                                       VAR_NAMESPACE, &syms, &blocks);
+                                       VAR_DOMAIN, &syms, &blocks);
 
       /* Check for a type definition. */
 

diff --git a/gdb/ada-tasks.c b/gdb/ada-tasks.c
index ad67cba10fe7660402e5f47512dea88fae44aae5..0cf4d832532a3f40f37273742d942edd90033250 100644 (file)
--- a/gdb/ada-tasks.c
+++ b/gdb/ada-tasks.c
@@ -22,6 +22,7 @@
 #include "inferior.h"
 #include "symtab.h"
 #include "target.h"
+#include "regcache.h"
 #include "gdbcore.h"
 
 #if (defined(__alpha__) && defined(__osf__) && !defined(__alpha_vxworks))
@@ -90,8 +91,6 @@ extern void *GET_CURRENT_THREAD ();
 #define READ_MEMORY(addr, var) read_memory (addr, (char*) &var, sizeof (var))
 /* external declarations */
 
-extern struct value *find_function_in_inferior (char *);
-
 /* Global visible variables */
 
 struct task_entry *task_list = NULL;