diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-05 02:43:51 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-05 02:43:51 -0300 |
| commit | 61b68fb9fca39dda7e4b48c5af9567dc60ea3dd2 (patch) | |
| tree | 6b8b6fb14ede5aae651e92f593252dba143cee74 /~emulatorman/mednafen-wip/build.patch | |
| parent | ca998b4c054452abed4e01be1d2b28fee0ca904f (diff) | |
| parent | 5801c5acd80d30d17aaef76b8bc401c61b3ef3c9 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/camlp5/PKGBUILD
community/coq/PKGBUILD
community/ldns/PKGBUILD
community/luxrays/PKGBUILD
community/luxrender/PKGBUILD
community/nut/PKGBUILD
community/root/PKGBUILD
community/swi-prolog/PKGBUILD
community/vtk/PKGBUILD
community/wings3d/wings3d.sh
core/sqlite3/PKGBUILD
core/tzdata/PKGBUILD
extra/cmus/PKGBUILD
extra/dcron/PKGBUILD
extra/farsight2/PKGBUILD
extra/foomatic/PKGBUILD
extra/fwbuilder/PKGBUILD
extra/gnome-utils/PKGBUILD
extra/ivtv-utils/PKGBUILD
extra/kdebase-konsole/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/kdesdk/PKGBUILD
extra/koffice/PKGBUILD
extra/libxfce4menu/PKGBUILD
extra/openmpi/PKGBUILD
extra/telepathy-butterfly/PKGBUILD
extra/telepathy-farsight/PKGBUILD
extra/telepathy-kde-presence-dataengine/PKGBUILD
extra/telepathy-qt4/PKGBUILD
extra/xfce-utils/PKGBUILD
extra/xulrunner/PKGBUILD
multilib/lib32-zlib/PKGBUILD
staging/gimp-devel/gimp-devel.install
testing/gtk3/PKGBUILD
testing/php/PKGBUILD
~xihh/couchdb-git/couchdb.install
~xihh/couchdb-git/rc-script.patch
~xihh/gmime24/PKGBUILD
Diffstat (limited to '~emulatorman/mednafen-wip/build.patch')
| -rw-r--r-- | ~emulatorman/mednafen-wip/build.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/~emulatorman/mednafen-wip/build.patch b/~emulatorman/mednafen-wip/build.patch deleted file mode 100644 index 7985a19ed..000000000 --- a/~emulatorman/mednafen-wip/build.patch +++ /dev/null @@ -1,31 +0,0 @@ -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) - { |