| Re: [hatari-users] Re: [hatari-devel] Hatari 2.2.1 has been released |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/hatari-users Archives
]
- To: hatari-users@xxxxxxxxxxxxxxxxxxx
- Subject: Re: [hatari-users] Re: [hatari-devel] Hatari 2.2.1 has been released
- From: Thomas Huth <th.huth@xxxxxxxxx>
- Date: Sun, 10 Feb 2019 14:21:40 +0100
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017; t=1549804901; bh=hMHutxUixq7hVKDGbv/JElLvrrdy7aNxbeXSbmoiQmE=; h=Date:From:To:Subject:From; b=Vcffa9ZGxMUwRUK/2du0Io8tVynWdFc9NCjD01EKJia1D55R9Y5A4dCulApciu1r5 0KD+tqXv0y1rVz9hXEYCjzCpAoH5+p/iL+vxmyziX5yuxcFI8Dhy2SvFMqF5PkSZHk RW0aDLyN3MYJ4BTNZxmiWRGWbHg07VGzhOBPjajkzOmKRh6BrKrrunojtzt9axXBx4 UqaDtcWwfDqlOcTmbhDMwWUsWqgTZYlJ13dYCfOiZl8Eer2jpNF+bkvNQbMPPazIu4 t2HpsAHLzyWKSIa7ZNFpkckmz0y+maUiy0z0komzbJUohUEtIu65qpqTFYi7NjmDpK 3JxzlXKe5/+xg==
Am Sun, 10 Feb 2019 14:13:16 +0100
schrieb tuxic@xxxxxxxxx:
> On 02/10 01:52, Thomas Huth wrote:
> > Am Sun, 10 Feb 2019 04:26:28 +0100
> > schrieb tuxic@xxxxxxxxx:
[...]
> > > src/CMakeFiles/hatari.dir/floppy_ipf.c.o /home/user/data/pools/pool05/hatari-2.2.1/src/floppy_ipf.c:64:2:
> > > error: unknown type name ‘CapsLong’ CapsLong
> >
> > Does this patch fix the issue for you:
> >
> > diff -r src/floppy_ipf.c
> > --- a/src/floppy_ipf.c Sat Feb 09 18:45:35 2019 +0100
> > +++ b/src/floppy_ipf.c Sun Feb 10 13:48:35 2019 +0100
> > @@ -31,6 +31,8 @@
> > #ifdef HAVE_CAPSIMAGE
> > #if CAPSIMAGE_VERSION == 5
> > #include <caps5/CapsLibAll.h>
> > +#define CapsLong SDWORD
> > +#define CapsULong UDWORD
> > #else
> > #include <caps/fdc.h>
> > #define CAPS_LIB_RELEASE 4
> >
> > ?
> >
> > Thomas
>
> Hi Thomas,
>
> thanks for the patch!!! :)
>
> Unfortunately, it does not work:
> In file included from /usr/local/include/caps5/CapsLibAll.h:7,
> from /home/user/data/pools/pool05/hatari-2.2.1/src/floppy_ipf.c:33:
> /usr/local/include/caps5/CapsFDC.h:134:22: error: expected ‘)’ before
> ‘*’ token typedef void (__cdecl *CAPSFDCHOOK)(PCAPSFDC pfdc, UDWORD
> state); ^~
If that header does not define __cdecl and still wants to use it, then
this Caps5 package is definitely broken in Gentoo. Do you know if there
is any other software in Gentoo which can use this library properly?
You could try to work around that problem by adding this line before
the #include <caps5/CapsLibAll.h> :
#define __cdecl
.... but I suggest to rather complain to the person instead who provided
that package.
Thomas