Fix gdbtk build breakage

Fix gdbtk build breakage

[Ben Elliston]

[-- Attachment #1: Type: text/plain, Size: 1452 bytes --]

This fixes a gdbtk build breakage.  Okay for mainline?


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.

Index: gdbtk-interp.c
===================================================================
RCS file: /home/bje/src-cvs/src/gdb/gdbtk/generic/gdbtk-interp.c,v
retrieving revision 1.5
diff -u -p -r1.5 gdbtk-interp.c
--- gdbtk-interp.c      18 Jan 2005 00:14:39 -0000      1.5
+++ gdbtk-interp.c      28 Apr 2005 01:31:08 -0000
@@ -113,7 +113,7 @@ gdbtk_interpreter_display_prompt_p (void
   return 1;
 }

-static struct exception
+static struct gdb_exception
 gdbtk_interpreter_exec (void *data, const char *command_str)
 {
   return exception_none;
Index: gdbtk.c
===================================================================
RCS file: /home/bje/src-cvs/src/gdb/gdbtk/generic/gdbtk.c,v
retrieving revision 1.41
diff -u -p -r1.41 gdbtk.c
--- gdbtk.c     25 Feb 2005 22:23:25 -0000      1.41
+++ gdbtk.c     28 Apr 2005 01:31:08 -0000
@@ -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;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 256 bytes --]

Re: Fix gdbtk build breakage

[Keith Seitz]

On Thu, 2005-04-28 at 11:32 +1000, Ben Elliston wrote:
> This fixes a gdbtk build breakage.  Okay for mainline?

Absolutely! I think things like this would fall under the "obvious"
rules that gdb uses. [Okay, I know that officially Insight isn't part of
gdb, but I would like it to be, so I delude myself and use the same
rules they do.]

Thanks!
Keith

> 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.
> 
> Index: gdbtk-interp.c
> ===================================================================
> RCS file: /home/bje/src-cvs/src/gdb/gdbtk/generic/gdbtk-interp.c,v
> retrieving revision 1.5
> diff -u -p -r1.5 gdbtk-interp.c
> --- gdbtk-interp.c      18 Jan 2005 00:14:39 -0000      1.5
> +++ gdbtk-interp.c      28 Apr 2005 01:31:08 -0000
> @@ -113,7 +113,7 @@ gdbtk_interpreter_display_prompt_p (void
>    return 1;
>  }
> 
> -static struct exception
> +static struct gdb_exception
>  gdbtk_interpreter_exec (void *data, const char *command_str)
>  {
>    return exception_none;
> Index: gdbtk.c
> ===================================================================
> RCS file: /home/bje/src-cvs/src/gdb/gdbtk/generic/gdbtk.c,v
> retrieving revision 1.41
> diff -u -p -r1.41 gdbtk.c
> --- gdbtk.c     25 Feb 2005 22:23:25 -0000      1.41
> +++ gdbtk.c     28 Apr 2005 01:31:08 -0000
> @@ -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;