Fix compile issue with zlib-1.2.6 (bug #403485).

(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

1 files changed, 47 insertions, 0 deletions

diff --git a/games-emulation/vbam/files/vbam-1.8.0.1009-zlib-1.2.6.patch b/games-emulation/vbam/files/vbam-1.8.0.1009-zlib-1.2.6.patch
new file mode 100644
index 000000000000..2be7c50b2963
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-1.8.0.1009-zlib-1.2.6.patch
@@ -0,0 +1,47 @@
+--- vbam-1.8.0.1009.orig/fex/fex/Data_Reader.cpp
++++ vbam-1.8.0.1009/fex/fex/Data_Reader.cpp
+@@ -732,11 +732,11 @@
+ 
+ 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 < 0 )
+-			return convert_gz_error( file_ );
++			return convert_gz_error( (gzFile)file_ );
+ 		
+ 		return blargg_err_file_corrupt;
+ 	}
+@@ -746,8 +746,8 @@
+ 
+ blargg_err_t Gzip_File_Reader::seek_v( int n )
+ {
+-	if ( gzseek( file_, n, SEEK_SET ) < 0 )
+-		return convert_gz_error( file_ );
++	if ( gzseek( (gzFile)file_, n, SEEK_SET ) < 0 )
++		return convert_gz_error( (gzFile)file_ );
+ 
+ 	return blargg_ok;
+ }
+@@ -756,7 +756,7 @@
+ {
+ 	if ( file_ )
+ 	{
+-		if ( gzclose( file_ ) )
++		if ( gzclose( (gzFile)file_ ) )
+ 			check( false );
+ 		file_ = NULL;
+ 	}
+--- vbam-1.8.0.1009.orig/src/Util.cpp
++++ vbam-1.8.0.1009/src/Util.cpp
+@@ -544,7 +544,7 @@
+ 
+ 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;
+   utilGzCloseFunc = gzclose;
+   utilGzSeekFunc = gzseek;