diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-02-22 17:09:53 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-02-22 17:09:53 -0300 |
| commit | 6cb3779930bb81b2e87eb0440b6a730ca99e9d56 (patch) | |
| tree | 0af039b9463ff5c40b657de200b9dd06675328dc /~emulatorman/mednafen-wip/build.patch | |
| parent | f4e8283bcde80efd3e057defa14476a708c3d34d (diff) | |
| parent | 08ffdb45067133abf9caba2636fa2e1d98d33b58 (diff) | |
| download | abslibre-6cb3779930bb81b2e87eb0440b6a730ca99e9d56.tar.gz abslibre-6cb3779930bb81b2e87eb0440b6a730ca99e9d56.tar.bz2 abslibre-6cb3779930bb81b2e87eb0440b6a730ca99e9d56.zip | |
Merge branch 'master' of ssh://gparabola/abslibre
Conflicts:
kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch
Diffstat (limited to '~emulatorman/mednafen-wip/build.patch')
| -rw-r--r-- | ~emulatorman/mednafen-wip/build.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/~emulatorman/mednafen-wip/build.patch b/~emulatorman/mednafen-wip/build.patch new file mode 100644 index 000000000..7985a19ed --- /dev/null +++ b/~emulatorman/mednafen-wip/build.patch @@ -0,0 +1,31 @@ +diff --git a/src/file.cpp b/src/file.cpp +index 57f4e13..ec1181c 100644 +--- a/src/file.cpp ++++ b/src/file.cpp +@@ -293,7 +293,7 @@ bool MDFNFILE::MakeMemWrapAndClose(void *tz, int type) + goto doret; + } + +- while((howmany = gzread(tz, f_data + cur_size, cur_alloced - cur_size)) > 0) ++ while((howmany = gzread((gzFile)tz, f_data + cur_size, cur_alloced - cur_size)) > 0) + { + cur_size += howmany; + cur_alloced <<= 1; +@@ -320,7 +320,7 @@ bool MDFNFILE::MakeMemWrapAndClose(void *tz, int type) + { + int gzerrnum = 0; + const char *gzerrstring; +- if((gzerrstring = gzerror(tz, &gzerrnum)) && gzerrnum != Z_OK && gzerrnum != Z_STREAM_END) ++ if((gzerrstring = gzerror((gzFile)tz, &gzerrnum)) && gzerrnum != Z_OK && gzerrnum != Z_STREAM_END) + { + if(gzerrnum != Z_ERRNO) + { +@@ -365,7 +365,7 @@ bool MDFNFILE::MakeMemWrapAndClose(void *tz, int type) + } + else if(type == MDFN_FILETYPE_GZIP) + { +- gzclose(tz); ++ gzclose((gzFile)tz); + } + else if(type == MDFN_FILETYPE_ZIP) + { |