Re: [hatari-devel] Re: Problem on OSX 10.10

[David Savinkoff <dsavnkff@xxxxxxxxx>]

----- Christer Solskogen <christer.solskogen@xxxxxxxxx> wrote:
> On Tue, Oct 28, 2014 at 12:17 AM, Christer Solskogen
> <christer.solskogen@xxxxxxxxx> wrote:
> > I got this now:
> >
> > [  1%] Building C object src/CMakeFiles/Floppy.dir/zip.c.o
> > /Users/solskogen/source/hatari/src/zip.c:679:8: error: conflicting
> > types for 'ZIP_ReadDisk'
> > Uint8 *ZIP_ReadDisk(int Drive, const char *name, const char *path, long *size)
> >        ^
> > /Users/solskogen/source/hatari/src/includes/zip.h:24:15: note:
> > previous declaration is here
> > extern Uint8 *ZIP_ReadDisk(int Drive, const char *pszFileName, const
> > char *pszZipPath, long *pImageSize, int *pImageType);
> >               ^
> > 1 error generated.
> > make[2]: *** [src/CMakeFiles/Floppy.dir/zip.c.o] Error 1
> > make[1]: *** [src/CMakeFiles/Floppy.dir/all] Error 2
> > make: *** [all] Error 2
> >
> 
> False alarm. Almost. I was missing zlib, for some weird reason.
> 
> 

Note that the function prototype in zip.h is declared with more
parameters (and different variable names) than the function in zip.c