Date: Thu, 12 Jul 2001 10:58:41 +0300 (WET)
From: Andris Pavenis <pavenis AT lanet DOT lv>
To: Eli Zaretskii <eliz AT is DOT elta DOT co DOT il>
Cc: djgpp-workers AT delorie DOT com
Subject: Re: 5.1 release schedule (fwd)
In-Reply-To: <Pine.SUN.3.91.1010712102157.17050K-100000@is>
Message-ID: <Pine.A41.4.05.10107121050360.35634-100000@ieva06.lanet.lv>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Reply-To: djgpp-workers AT delorie DOT com
Errors-To: nobody AT delorie DOT com
X-Mailing-List: djgpp-workers AT delorie DOT com
X-Unsubscribes-To: listserv AT delorie DOT com
Precedence: bulk



On Thu, 12 Jul 2001, Eli Zaretskii wrote:

> See the attached: the GDB maintainer intends to cut the release branch in 
> a few days, and start the pretest in a week or so.
> 
> It would be nice if people could download some recent snapshot, or use 
> anon CVS to get the current sources, build the DJGPP port, and report any 
> problems.
> 

As far as I remeber I had to patch 2 files last time I built gdb current
version for DJGPP about a month ago (with gcc-3.0 prerelease)

gdb/breakpoint.h and gdb/breakpoint.c uses name 'disable' which conflicted
with disable() from pc.h. I renamed it to bp_disable in both these files
that time.  

gcc -c -O2  -DNO_MMALLOC  -I. -I. -I./config -DHAVE_CONFIG_H  -I./../include/opco
de -I./../readline/.. -I../bfd -I./../bfd  -I./../include -I../intl -I./../intl
 -DUI_OUT=1 -Wimplicit -Wcomment -Wformat -Wparentheses -Wpointer-arith utils.c

In file included from inferior.h:27,
                 from utils.c:55:
breakpoint.h:164: `disable' redeclared as different kind of symbol
c:/djgpp/include/dos.h:158: previous declaration of `disable'
breakpoint.h:164: warning: `disable' was declared `extern' and later `static'
make.exe[1]: *** [utils.o] Error 1
make.exe[1]: Leaving directory `d:/Devel/gdb/gdb+dejagnu-20010614/gdb'
make.exe: *** [all-gdb] Error 2



Andris


--- gdb/gdb/breakpoint.h~1	Sun May  6 04:35:56 2001
+++ gdb/gdb/breakpoint.h	Fri Jun 15 18:37:16 2001
@@ -161,7 +161,7 @@
   {
     del,			/* Delete it */
     del_at_next_stop,		/* Delete at next stop, whether hit or not */
-    disable,			/* Disable it */
+    bp_disable,			/* Disable it */
     donttouch			/* Leave it alone */
   };
 
--- gdb/gdb/breakpoint.c~1	Mon Jun 11 19:05:24 2001
+++ gdb/gdb/breakpoint.c	Fri Jun 15 18:38:56 2001
@@ -2656,7 +2656,7 @@
 	else
 	  {
 	    /* We will stop here */
-	    if (b->disposition == disable)
+	    if (b->disposition == bp_disable)
 	      b->enable = disabled;
 	    bs->commands = b->commands;
 	    if (b->silent)
@@ -7509,7 +7509,7 @@
 static void
 enable_once_breakpoint (struct breakpoint *bpt)
 {
-  do_enable_breakpoint (bpt, disable);
+  do_enable_breakpoint (bpt, bp_disable);
 }
 
 /* ARGSUSED */