Re: [patch] comment cleanup

[Joel Brobecker <brobecker@adacore.com>]

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

> 2010-12-28  Michael Snyder  <msnyder@vmware.com>
> 
> 	* event-loop.c: Comment clean-up.
> 	* event-loop.h: Ditto.
> 	* event-top.c: Ditto.
> 	* gdb.c: Ditto.
> 	* gdb.h: Ditto.
> 	* main.c: Ditto.
> 	* top.c: Ditto.
> 	* top.h: Ditto.	

I just noticed that gdb.c contains unadvertized code updates :-),
and this is causing the build to fail on platforms where mcheck.h
is not available (Eg. ppc-aix).

These have now been reverted with the following commit.

> Index: gdb.c
> ===================================================================
> RCS file: /cvs/src/src/gdb/gdb.c,v
> retrieving revision 1.9
> diff -u -p -r1.9 gdb.c
> --- gdb.c	14 May 2010 20:17:37 -0000	1.9
> +++ gdb.c	29 Dec 2010 00:53:53 -0000
> @@ -20,16 +20,21 @@
>  #include "main.h"
>  #include "gdb_string.h"
>  #include "interps.h"
> +#include <mcheck.h>
>  
>  int
>  main (int argc, char **argv)
>  {
>    struct captured_main_args args;
> +  int ret;
>  
> +  mtrace ();
>    memset (&args, 0, sizeof args);
>    args.argc = argc;
>    args.argv = argv;
>    args.use_windows = 0;
>    args.interpreter_p = INTERP_CONSOLE;
> -  return gdb_main (&args);
> +  ret = gdb_main (&args);
> +  muntrace();
> +  return ret;

-- 
Joel

[-- Attachment #2: gdb.diff --]
[-- Type: text/x-diff, Size: 1297 bytes --]

commit f185a672c4ad8b37ba3b0d297b2240b004aad6a7
Author: Joel Brobecker <brobecker@adacore.com>
Date:   Wed Dec 29 14:17:12 2010 +0400

    revert previous gdb.c commit (it was not a minor comment update)
    
    gdb/ChangeLog:
    
           * gdb.c: Revert the previous change, which was probably committed
            by accident.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 43bba0c..b7be1ad 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2010-12-29  Joel Brobecker  <brobecker@adacore.com>
 
+	* gdb.c: Revert the previous change, which was probably committed
+        by accident.
+
+2010-12-29  Joel Brobecker  <brobecker@adacore.com>
+
 	* ada-lang.c: Fix typo in comment.
 
 2010-12-29  Joel Brobecker  <brobecker@adacore.com>
diff --git a/gdb/gdb.c b/gdb/gdb.c
index 74f806e..bc5e6cc 100644
--- a/gdb/gdb.c
+++ b/gdb/gdb.c
@@ -20,21 +20,16 @@
 #include "main.h"
 #include "gdb_string.h"
 #include "interps.h"
-#include <mcheck.h>
 
 int
 main (int argc, char **argv)
 {
   struct captured_main_args args;
-  int ret;
 
-  mtrace ();
   memset (&args, 0, sizeof args);
   args.argc = argc;
   args.argv = argv;
   args.use_windows = 0;
   args.interpreter_p = INTERP_CONSOLE;
-  ret = gdb_main (&args);
-  muntrace();
-  return ret;
+  return gdb_main (&args);
 }