sim: callback: add human readable strings for debugging to maps

[deliverable/binutils-gdb.git] / gdb / cli / cli-logging.c

diff --git a/gdb/cli/cli-logging.c b/gdb/cli/cli-logging.c
index ca2d76eda33cfb77caf02133bb1b611470778caa..7d340c141acc8870c8c3507ee2d1fc9b7a6f3ba5 100644 (file)
--- a/gdb/cli/cli-logging.c
+++ b/gdb/cli/cli-logging.c
@@ -1,6 +1,6 @@
 /* Command-line output logging for GDB, the GNU debugger.
 
-   Copyright (C) 2003-2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2015 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -21,9 +21,6 @@
 #include "gdbcmd.h"
 #include "ui-out.h"
 #include "interps.h"
-#include "gdb_assert.h"
-
-#include <string.h>
 
 /* These hold the pushed copies of the gdb output files.
    If NULL then nothing has yet been pushed.  */
@@ -171,7 +168,7 @@ pop_output_files (void)
       gdb_stderr = saved_output.err;
       gdb_stdlog = saved_output.log;
       gdb_stdtarg = saved_output.targ;
-      gdb_stdtargerr = saved_output.targ;
+      gdb_stdtargerr = saved_output.targerr;
     }
 
   saved_output.out = NULL;