[PATCH] Fix build errors

[Keith Seitz <keiths at redhat dot com>]

Hi,

Gdb is at it again... Infrastructure changes which caused the build to
be broken. I've committed the attached patch which should fix it.

Keith

ChangeLog
2005-01-17  Keith Seitz  <kseitz@sources.redhat.com>
 
        * generic/gdbtk-varobj.c (variable_value): Remove all instances
        of error_last_message. It's gone.
 
        * generic/gdbtk-wrapper.c: Include exceptions.h
        * generic/gdbtk-cmds.c: Likewise.
        * generic/gdbtk-interp.c: Likewise.
        (gdbtk_interpreter_exec): Change return type to struct
        exception. Return exception_none.

Index: generic/gdbtk-cmds.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-cmds.c,v
retrieving revision 1.85
diff -u -p -r1.85 gdbtk-cmds.c
--- generic/gdbtk-cmds.c	13 Dec 2004 20:42:20 -0000	1.85
+++ generic/gdbtk-cmds.c	18 Jan 2005 00:13:00 -0000
@@ -39,6 +39,7 @@
 #include "filenames.h"
 #include "disasm.h"
 #include "value.h"
+#include "exceptions.h"
 
 /* tcl header files includes varargs.h unless HAS_STDARG is defined,
    but gdb uses stdarg.h, so make sure HAS_STDARG is defined.  */
Index: generic/gdbtk-interp.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-interp.c,v
retrieving revision 1.4
diff -u -p -r1.4 gdbtk-interp.c
--- generic/gdbtk-interp.c	22 Apr 2004 16:51:43 -0000	1.4
+++ generic/gdbtk-interp.c	18 Jan 2005 00:13:00 -0000
@@ -28,6 +28,7 @@
 #include "gdb_string.h"
 #include "cli/cli-cmds.h"
 #include "cli/cli-decode.h"
+#include "exceptions.h"
 
 #include "tcl.h"
 #include "tk.h"
@@ -112,10 +113,10 @@ gdbtk_interpreter_display_prompt_p (void
   return 1;
 }
 
-static int
+static struct exception
 gdbtk_interpreter_exec (void *data, const char *command_str)
 {
-  return 1;
+  return exception_none;
 }
 
 /* This function is called instead of gdb's internal command loop.  This is the
Index: generic/gdbtk-varobj.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-varobj.c,v
retrieving revision 1.17
diff -u -p -r1.17 gdbtk-varobj.c
--- generic/gdbtk-varobj.c	25 Nov 2003 01:44:06 -0000	1.17
+++ generic/gdbtk-varobj.c	18 Jan 2005 00:13:00 -0000
@@ -567,9 +567,7 @@ variable_value (Tcl_Interp *interp, int 
 	  s = Tcl_GetStringFromObj (objv[2], NULL);
 	  if (!varobj_set_value (var, s))
             {
-	      r = error_last_message();
-	      gdbtk_set_result (interp, "%s", r);
-	      xfree (r);
+	      gdbtk_set_result (interp, "Could not assign expression to variable object");
 	      return TCL_ERROR;
             }
 	}
@@ -582,9 +580,7 @@ variable_value (Tcl_Interp *interp, int 
 
   if (r == NULL)
     {
-      char *err = error_last_message ();
-      gdbtk_set_result (interp, "%s", err);
-      xfree (err);
+      gdbtk_set_result (interp, "Could not read variable object value after assignment");
       return TCL_ERROR;
     }
   else
Index: generic/gdbtk-wrapper.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/generic/gdbtk-wrapper.c,v
retrieving revision 1.10
diff -u -p -r1.10 gdbtk-wrapper.c
--- generic/gdbtk-wrapper.c	19 Nov 2004 00:19:56 -0000	1.10
+++ generic/gdbtk-wrapper.c	18 Jan 2005 00:13:00 -0000
@@ -21,6 +21,7 @@
 #include "frame.h"
 #include "value.h"
 #include "block.h"
+#include "exceptions.h"
 #include "gdbtk-wrapper.h"
 
 /*