Fix gdbserver/MI testing regression

[deliverable/binutils-gdb.git] / gdb / psymtab.c

diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index 6f7fec602cac07be04bd72359693ede8ab63857d..a39c6e257a2ad186f385ab5533dc90e67c6c9703 100644 (file)
--- a/gdb/psymtab.c
+++ b/gdb/psymtab.c
@@ -1,6 +1,6 @@
 /* Partial symbol tables.
 
-   Copyright (C) 2009-2015 Free Software Foundation, Inc.
+   Copyright (C) 2009-2016 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -1224,7 +1224,8 @@ psymtab_to_fullname (struct partial_symtab *ps)
          if (ps->dirname == NULL || IS_ABSOLUTE_PATH (ps->filename))
            fullname = xstrdup (ps->filename);
          else
-           fullname = concat (ps->dirname, SLASH_STRING, ps->filename, NULL);
+           fullname = concat (ps->dirname, SLASH_STRING,
+                              ps->filename, (char *) NULL);
 
          back_to = make_cleanup (xfree, fullname);
          ps->fullname = rewrite_source_path (fullname);
@@ -1904,9 +1905,10 @@ struct dump_psymtab_addrmap_data
 static int
 dump_psymtab_addrmap_1 (void *datap, CORE_ADDR start_addr, void *obj)
 {
-  struct dump_psymtab_addrmap_data *data = datap;
+  struct dump_psymtab_addrmap_data *data
+    = (struct dump_psymtab_addrmap_data *) datap;
   struct gdbarch *gdbarch = get_objfile_arch (data->objfile);
-  struct partial_symtab *addrmap_psymtab = obj;
+  struct partial_symtab *addrmap_psymtab = (struct partial_symtab *) obj;
   const char *psymtab_address_or_end = NULL;
 
   QUIT;