Merge branch 'master' into merge-job

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

diff --git a/gdb/gdb_obstack.c b/gdb/gdb_obstack.c
index b972eabeb99a738d1592b723dcf6b624b1976bb7..43e7a68a7fdabccd2fc110dbcb8d198b1f6e958a 100644 (file)
--- a/gdb/gdb_obstack.c
+++ b/gdb/gdb_obstack.c
@@ -1,6 +1,6 @@
 /* Obstack wrapper for GDB.
 
-   Copyright (C) 2013-2015 Free Software Foundation, Inc.
+   Copyright (C) 2013-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -43,5 +43,5 @@ obconcat (struct obstack *obstackp, ...)
   va_end (ap);
   obstack_1grow (obstackp, 0);
 
-  return obstack_finish (obstackp);
+  return (char *) obstack_finish (obstackp);
 }