This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
Re: RedBoot - improve load command
However this simple patch solves the problem
Regards
iz
On Monday 08 July 2002 09:24, Iztok Zupet wrote:
> FIxed it later that way too, but it must be corrected in the CVS.
>
> Regards
> iz
>
> On Monday 08 July 2002 07:45, Björn Runåker (QIC) wrote:
> > Sorry, the correct line in fs/disk.h that works for me is:
> >
> > externC int disk_stream_open(connection_info_t*, int *err);
> >
> > Regards,
> > /Bjorn
> >
> > -----Original Message-----
> > From: Iztok Zupet [mailto:iz@vsr.si]
> > Sent: Sunday, July 07, 2002 7:52 PM
> > To: Gary Thomas; eCos patches
> > Subject: Re: RedBoot - improve load command
> >
> >
> >
> > Hello:
> >
> > I wanted to rebuild RedBoot today and noticed that Your patch caused the
> > following compile error:
> >
> > /ecoscvs/patchwork/ecos/packages/redboot/current/src/fs/disk.c:361:
> > conflicting types for `disk_stream_open'
> > make[1]: Leaving directory
> > `/mnt/work/ecos-work/cvs/try/unnamed2_build/redboot/current'
> > /mnt/work/ecos-work/cvs/try/unnamed2_install/include/fs/disk.h:168:
> > previous declaration of `disk_stream_open'
> >
> > Regards
> > iz
diff -C2 -N -P -r -x '.*' /ecoscvs/orig/ecos/packages/redboot/current/ChangeLog ./redboot/current/ChangeLog
*** /ecoscvs/orig/ecos/packages/redboot/current/ChangeLog Mon Jul 1 22:55:25 2002
--- ./redboot/current/ChangeLog Tue Jul 9 10:51:37 2002
***************
*** 1,2 ****
--- 1,6 ----
+ 2002-07-09 Iztok Zupet <iz@vsr.si>
+
+ * include/fs/disk.h: Fixed disk_stream_open redefinition error
+
2002-07-01 Gary Thomas <gary@chez-thomas.org>
diff -C2 -N -P -r -x '.*' /ecoscvs/orig/ecos/packages/redboot/current/include/fs/disk.h ./redboot/current/include/fs/disk.h
*** /ecoscvs/orig/ecos/packages/redboot/current/include/fs/disk.h Fri May 24 01:08:28 2002
--- ./redboot/current/include/fs/disk.h Tue Jul 9 10:46:02 2002
***************
*** 166,170 ****
#define diskerr_read -4
! externC int disk_stream_open(char *filename, int *err);
externC void disk_stream_close(int *err);
externC int disk_stream_read(char *buf, int size, int *err);
--- 166,170 ----
#define diskerr_read -4
! externC int disk_stream_open(connection_info_t *info, int *err);
externC void disk_stream_close(int *err);
externC int disk_stream_read(char *buf, int size, int *err);