ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build errors with zlib-1.2.6. 

The problem relates to gzFile not being a typedef of voidp anymore in zlib-1.2.6.
Thanks to Tim Harder for the patch.
This commit is contained in:
bgk 2012-03-25 08:09:07 +00:00
parent 0221929951
commit 092f67b0e8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fex/fex/Data_Reader.cpp
View File

@ -732,11 +732,11 @@ static blargg_err_t convert_gz_error( gzFile file )
blargg_err_t Gzip_File_Reader::read_v( void* p, int s ) blargg_err_t Gzip_File_Reader::read_v( void* p, int s )
{ {
int result = gzread( file_, p, s ); int result = gzread( (gzFile)file_, p, s );
if ( result != s ) if ( result != s )
{ {
if ( result < 0 ) if ( result < 0 )
return convert_gz_error( file_ ); return convert_gz_error( (gzFile)file_ );
return blargg_err_file_corrupt; return blargg_err_file_corrupt;
} }
@ -746,8 +746,8 @@ blargg_err_t Gzip_File_Reader::read_v( void* p, int s )
blargg_err_t Gzip_File_Reader::seek_v( int n ) blargg_err_t Gzip_File_Reader::seek_v( int n )
{ {
if ( gzseek( file_, n, SEEK_SET ) < 0 ) if ( gzseek( (gzFile)file_, n, SEEK_SET ) < 0 )
return convert_gz_error( file_ ); return convert_gz_error( (gzFile)file_ );
return blargg_ok; return blargg_ok;
} }
@ -756,7 +756,7 @@ void Gzip_File_Reader::close()
{ {
if ( file_ ) if ( file_ )
{ {
if ( gzclose( file_ ) ) if ( gzclose( (gzFile)file_ ) )
check( false ); check( false );
file_ = NULL; file_ = NULL;
} }

2
src/Util.cpp
View File

@ -590,7 +590,7 @@ void utilWriteData(gzFile gzFile, variable_desc *data)
gzFile utilGzOpen(const char *file, const char *mode) gzFile utilGzOpen(const char *file, const char *mode)
{ {
utilGzWriteFunc = (int (ZEXPORT *)(void *,void * const, unsigned int))gzwrite; utilGzWriteFunc = (int (ZEXPORT *)(gzFile, void * const, unsigned int))gzwrite;
utilGzReadFunc = gzread; utilGzReadFunc = gzread;
utilGzCloseFunc = gzclose; utilGzCloseFunc = gzclose;
utilGzSeekFunc = gzseek; utilGzSeekFunc = gzseek;