From a7c7f063c14c7afaca7e47211642385cd6f18fd4 Mon Sep 17 00:00:00 2001
From: bgk <bgk@a31d4220-a93d-0410-bf67-fe4944624d44>
Date: Sun, 25 Mar 2012 08:09:07 +0000
Subject: [PATCH] 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.


git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1091 a31d4220-a93d-0410-bf67-fe4944624d44
---
 fex/fex/Data_Reader.cpp | 10 +++++-----
 src/Util.cpp            |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fex/fex/Data_Reader.cpp b/fex/fex/Data_Reader.cpp
index 83b09e2f..a461f780 100644
--- a/fex/fex/Data_Reader.cpp
+++ b/fex/fex/Data_Reader.cpp
@@ -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 )
 {
-	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::read_v( void* p, int s )
 
 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 @@ void Gzip_File_Reader::close()
 {
 	if ( file_ )
 	{
-		if ( gzclose( file_ ) )
+		if ( gzclose( (gzFile)file_ ) )
 			check( false );
 		file_ = NULL;
 	}
diff --git a/src/Util.cpp b/src/Util.cpp
index 95b1028d..590b9150 100644
--- a/src/Util.cpp
+++ b/src/Util.cpp
@@ -590,7 +590,7 @@ void utilWriteData(gzFile gzFile, variable_desc *data)
 
 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;