* solib-sunos.c (sunos_relocate_main_executable): Remove function.

[deliverable/binutils-gdb.git] / gdb / ada-lex.l

diff --git a/gdb/ada-lex.l b/gdb/ada-lex.l
index ca0414c501f1f7be0063e3cc5415ddb08201ef2d..21dba2c021b53ef79db2bd6097d47c98ab364880 100644 (file)
--- a/gdb/ada-lex.l
+++ b/gdb/ada-lex.l
@@ -331,7 +331,7 @@ xor         { return XOR; }
 %%
 
 #include <ctype.h>
-#include <string.h>
+#include "gdb_string.h"
 
 /* Initialize the lexer for processing new expression */
 void
@@ -724,7 +724,7 @@ name_lookup (char *name0, char *err_name, int *token_type, int depth)
                                           strlen (renaming) + len0
                                          - yylval.ssym.stoken.length + 1);
              strcpy (new_name, renaming);
-              free (renaming);
+              xfree (renaming);
              strcat (new_name, name0 + yylval.ssym.stoken.length);
              result = name_lookup (new_name, err_name, token_type, depth - 1);
              if (result > segments)
@@ -741,7 +741,9 @@ name_lookup (char *name0, char *err_name, int *token_type, int depth)
 
       if (segments == 0)
        {
-         type = lookup_primitive_typename (name);
+         type = language_lookup_primitive_type_by_name (current_language,
+                                                         current_gdbarch,
+                                                         name);
          if (type == NULL && strcmp ("system__address", name) == 0)
            type = builtin_type_ada_system_address;
          if (type != NULL)