Date: Mon, 10 Jun 2002 09:04:24 -0700 From: Alfred Perlstein <bright@mu.org> To: lioux@FreeBSD.org Cc: ports@freebsd.org Subject: Re: fix devel/ddd for 5.x Message-ID: <20020610160424.GO88163@elvis.mu.org> In-Reply-To: <20020609185136.GD88163@elvis.mu.org> References: <20020609185136.GD88163@elvis.mu.org>
next in thread | previous in thread | raw e-mail | index | archive | help
* Alfred Perlstein <bright@mu.org> [020609 11:51] wrote: > tested and compiled on 4.x and 5.x, seems to work and fixes compilation > on 5.x. > > There may be a better patch for the first two files that involves > mucking with configure but I don't know. Any reason to hold off on committing this? > > > Index: files/patch-strclass.C > =================================================================== > RCS file: files/patch-strclass.C > diff -N files/patch-strclass.C > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ files/patch-strclass.C 9 Jun 2002 07:55:38 -0000 > @@ -0,0 +1,11 @@ > +--- ddd/strclass.C.orig Fri Mar 30 04:31:46 2001 > ++++ ddd/strclass.C Sun Jun 9 00:29:48 2002 > +@@ -1431,7 +1431,7 @@ > + } > + x.rep->s[i] = 0; > + x.rep->len = i; > +-#if HAVE_IOSTATE > ++#if HAVE_IOSTATE || 1 > + ios::iostate new_state = s.rdstate(); > + #else > + int new_state = s.rdstate(); > Index: files/patch-streampos.h > =================================================================== > RCS file: files/patch-streampos.h > diff -N files/patch-streampos.h > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ files/patch-streampos.h 9 Jun 2002 07:55:58 -0000 > @@ -0,0 +1,11 @@ > +--- ddd/streampos.h.orig Mon Jan 17 06:53:42 2000 > ++++ ddd/streampos.h Sun Jun 9 00:36:50 2002 > +@@ -40,7 +40,7 @@ > + #include "config.h" > + > + #if !HAVE_STREAMPOS > +-typedef long streampos; > ++//typedef long streampos; > + #endif > + > + #endif // _DDD_streampos_h > Index: files/patch-strerror.c > =================================================================== > RCS file: files/patch-strerror.c > diff -N files/patch-strerror.c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ files/patch-strerror.c 9 Jun 2002 07:56:15 -0000 > @@ -0,0 +1,21 @@ > +--- libiberty/strerror.c.orig Sun Sep 26 23:07:42 1999 > ++++ libiberty/strerror.c Sun Jun 9 00:24:19 2002 > +@@ -17,6 +17,7 @@ > + #endif > + > + #include <stdio.h> > ++#include <string.h> > + #include <errno.h> > + > + #ifdef HAVE_SYS_ERRLIST > +@@ -462,8 +463,8 @@ > + > + #else > + > +-extern int sys_nerr; > +-extern char *sys_errlist[]; > ++extern const int sys_nerr; > ++extern const char *sys_errlist[]; > + > + #endif > + > Index: files/patch-strsignal.c > =================================================================== > RCS file: files/patch-strsignal.c > diff -N files/patch-strsignal.c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ files/patch-strsignal.c 9 Jun 2002 08:05:33 -0000 > @@ -0,0 +1,19 @@ > +--- libiberty/strsignal.c.orig Sun Jun 9 01:04:11 2002 > ++++ libiberty/strsignal.c Sun Jun 9 01:04:45 2002 > +@@ -19,6 +19,7 @@ > + #define sys_siglist no_such_symbol > + > + #include <stdio.h> > ++#include <string.h> > + #include <signal.h> > + > + /* Routines imported from standard C runtime libraries. */ > +@@ -244,7 +245,7 @@ > + #else > + > + #ifdef NSIG > +-static int sys_nsig = NSIG; > ++static const int sys_nsig = NSIG; > + #else > + #ifdef _NSIG > + static int sys_nsig = _NSIG; > > -- -Alfred Perlstein [alfred@freebsd.org] 'Instead of asking why a piece of software is using "1970s technology," start asking why software is ignoring 30 years of accumulated wisdom.' Tax deductible donations for FreeBSD: http://www.freebsdfoundation.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020610160424.GO88163>