* generic/gdbtk-interp.c (gdbtk_interpreter_exec): Return struct

	gdb_exception due to the 2005-04-26 renaming of struct exception.
	* generic/gdbtk.c (gdbtk_source_start_file): Likewise.

diff --git a/gdb/gdbtk/ChangeLog b/gdb/gdbtk/ChangeLog
index 8b1d394..ba082d5 100644 (file)
--- a/gdb/gdbtk/ChangeLog
+++ b/gdb/gdbtk/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-28  Ben Elliston  <bje@au.ibm.com>
+
+       * generic/gdbtk-interp.c (gdbtk_interpreter_exec): Return struct
+       gdb_exception due to the 2005-04-26 renaming of struct exception.
+       * generic/gdbtk.c (gdbtk_source_start_file): Likewise.
+
 2005-02-25  Keith Seitz  <kseitz@sources.redhat.com>
 
        * generic/gdbtk.c (gdbtk_source_start_file): In the _WIN32 case,

diff --git a/gdb/gdbtk/generic/gdbtk-interp.c b/gdb/gdbtk/generic/gdbtk-interp.c
index 0c6cb9e..0e66835 100644 (file)
--- a/gdb/gdbtk/generic/gdbtk-interp.c
+++ b/gdb/gdbtk/generic/gdbtk-interp.c
@@ -113,7 +113,7 @@ gdbtk_interpreter_display_prompt_p (void *data)
   return 1;
 }
 
-static struct exception
+static struct gdb_exception
 gdbtk_interpreter_exec (void *data, const char *command_str)
 {
   return exception_none;

diff --git a/gdb/gdbtk/generic/gdbtk.c b/gdb/gdbtk/generic/gdbtk.c
index 8324f74..778b082 100644 (file)
--- a/gdb/gdbtk/generic/gdbtk.c
+++ b/gdb/gdbtk/generic/gdbtk.c
@@ -635,7 +635,7 @@ gdbtk_find_main";
         get to see the failure reason.  */
       MessageBox (NULL, msg, NULL, MB_OK | MB_ICONERROR | MB_TASKMODAL);
       {
-        struct exception e;
+        struct gdb_exception e;
         e.reason  = RETURN_ERROR;
         e.error   = GENERIC_ERROR;
         e.message = msg;