pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/emulators/ucon64 ucon64: update to 2.1.0.
details: https://anonhg.NetBSD.org/pkgsrc/rev/0134646266b9
branches: trunk
changeset: 376567:0134646266b9
user: wiz <wiz%pkgsrc.org@localhost>
date: Sun Mar 04 15:20:02 2018 +0000
description:
ucon64: update to 2.1.0.
2.0.1
- updated (GB) internal name is 15 characters long only for GBC games. For GB
and SGB games it's 16 characters long. Updated ROM info and -n (by dbjh; thanks
to Anna Kubisty for reporting the problem and info)
- added (all) --xreset reset parallel port (by dbjh; thanks to Cyan Helkaraxe
for the idea)
- added (GBA) --sc convert to Super Card (CF to GBA Adapter)/SCZ; enables
"Saver patch", "restart to Menu" and "Real Time Save" (creates SAV and SCI
template) (by NoisyB)
- updated (NES) added support for new iNES header. Now --ntsc & --pal work also
for iNES files (by dbjh)
- updated (SMS/Game Gear) improved header length detection (by dbjh; many
thanks to Dweezledap for testing)
- added (N64) support for remaining 6101, 6103, and 6106 bootcodes (by
Parasyte)
- added (Coleco) recognition of Coleco ROMs (by NoisyB)
- added (Virtual Boy) recognition of Nintendo Virtual Boy ROMs (by NoisyB)
- updated (SMS/Game Gear) --smd produces a proper SMD header (by dbjh)
- updated (SMS/Game Gear) --smd does not interleave SMS or Game Gear files
anymore. As far as we know, no backup unit produces or is able to handle
interleaved SMS or Game Gear files (by dbjh; thanks to Matthias for verifying
this with his SMD)
- added (SNES) --idnum=NUM make --gd3 produce file names where first file has
numerical identifier NUM, next NUM + 1, etc. (by dbjh)
- updated (all) added alternative options for --rr83 & --force63 (--r83 &
--rjoliet respectively) (by NoisyB)
- updated (all) improved --r83 & --rjoliet (by dbjh)
- added (NDS) recognition of Nintendo DS ROMs (by NoisyB)
- added (Atari) recognition of Atari VCS 2600 ROMs (by NoisyB)
- added (all) --hfind=HEX find HEX codes in ROM (wildcard: '?') (by NoisyB)
- added (all) --hfindr=HEX like --hfind but looks also for shifted/relative
similarities (by NoisyB)
- added (all) --dfind=DEC find DEC codes in ROM (wildcard: '?') (by NoisyB)
- added (all) --dfindr=DEC like --dfind but looks also for shifted/relative
similarities (by NoisyB)
- updated (PCE) --multi now creates a multi-game file that will actually work
on the PCE-PRO (by dbjh; many thanks to Bryan Lama for reporting this bug and
for testing)
- updated (PCE) --xpce now correctly handles 3 and 4 Mbit games that are part
of a multi-game file (by dbjh; thanks to Bryan Lama for testing)
- updated (PCE, Genesis & SMS/Game Gear) --multi now produces more efficient
multi-game files which results in shorter upload times (by dbjh)
- updated (PCE, Genesis, SMS/Game Gear & SNES) all transfer options for ToToTEK
devices now check for the presence of the device (only the upload ROM options
used to do the check) (by dbjh)
- added (all) -r process subdirectories recursively (by NoisyB and dbjh)
- updated (SNES) improved reliability of --xgd3 (should reduce the frequency of
"File Size Error !") (by dbjh)
- added --help[=WHAT] WHAT=long,pad,dat,patch,backup,disc. Help output is now
smaller (by NoisyB)
- added (SNES) --mksrm create *.srm (SRAM) file with size based on ROM
information (by dbjh)
- updated FAQ with explanation about how to configure uCON64 for backup unit I/
O (through a parallel port) on 64-bit Windows (XP/2003/Vista/7/8/8.1/10) (by
dbjh)
- added (SNES) --xqd16 send ROM to Quickdev16 (by dbjh; thanks to David
Voswinkel for sending a patch)
2.0.2
- updated (SNES) --xqd16 can be aborted by pressing q on Mac OS X too (by dbjh;
many thanks to David Voswinkel for testing and sending a patch)
- updated (NES) --gg works properly for games using a mapper (by dbjh; thanks
to eadmaster for sending a bug report)
- updated (NES) --gg no longer accepts 6 digit codes. It lists all
corresponding 8 digit codes instead when given a 6 digit code (by dbjh)
- updated (Genesis) --gg modifies 2 bytes instead of 1 (by dbjh; thanks to
eadmaster for reporting the issue and testing)
- updated (Genesis) --ggd, --gge and --gg correctly handle Genesis patch values
(by dbjh; thanks to eadmaster for reporting the issue and testing)
- updated (SMS/Game Gear & GB) --gg can use the check byte (by dbjh)
2.0.3
- updated (NDS) fixed stupid mistake in reported device capacity (by dbjh)
- updated (NDS) fixed issue that caused ROMs with an incorrect SNES backup unit
header to be detected as Nintendo DS ROM dumps (by dbjh)
- updated (SNES) MinGW and Visual C++ ports can display colors again for --dbuh
(instead of ANSI escape sequences) (by dbjh)
- updated (SNES) fixed edge case in code of --dbuh for headered ROMs that are
not recognised as being for a specific backup unit (by dbjh)
- updated (all) upgraded unzip to version 1.01e. Did the same for libdiscmage
(by dbjh)
- updated (N64) fixed problem in Cygwin port of libcd64 with loading I/O
drivers (by dbjh)
- updated (all) fixed --hfind, --hfindr, --dfind and --dfindr, which I broke in
2.0.1. Also, 0 is no longer a wildcard and can be properly searched for.
Improved handling of non-printable characters (by dbjh)
2.1.0
- added (SNES) preliminary support for native Super UFO Pro 8 SD file format.
Use --ufosd to convert a file to Super UFO Pro 8 SD format. More information is
required for a full implementation and any help will be appreciated (by dbjh;
thanks to cage for his help)
- added (SNES) --ufosds convert *.srm (SRAM) file to Super UFO Pro 8 SD (by
dbjh; thanks to cage for the SRAM files)
- updated (SNES) added crack for Diddy's Kong Quest & Dixie Kong's Double
Trouble that makes those games run properly on the Super Flash. It has been
added to snescopy.txt, not to the internal cracks, because it may interfere
with the already present cracks of those games. Apply it with --pattern (by
dbjh, based on post by Tomy of ToToTEK on ToToTEK's Help & Support Forum)
- updated (all) fixed --xreset to really remove power from all programmable
pins (by dbjh)
- added (all) support for EPP when using a PCIe parallel port card that has its
ECP Extended Control register at a non-standard offset, i.e., most PCIe
parallel port cards. Specify the offset in the configuration file by changing
the line that starts with ecr_offset=. See the FAQ (question 53 and 54) for a
more elaborate explanation (by dbjh)
- updated (all) fixed several mistakes in how different pieces of code tried to
enable EPP or simply relied on a BIOS to have configured it right. As a result
the meaning of the switches --xfalm, --xgbxm and --xplm has been reversed (the
associated options use EPP mode by default and use SPP as fallback). Another
consequence is that UserPort can no longer be used as I/O driver (by dbjh)
- updated (SNES) improved --id to the point where its help text can be shown
(by dbjh)
- updated (SNES & Genesis) fixed several edge cases in MGD splitting code (by
dbjh)
- updated (SNES) fixed crash when splitting files in Game Doctor SF3 format >=
100 Mbit (by dbjh)
- updated (all) made --pattern more verbose when -v is specified (by dbjh)
- updated (GBA) made --crp more verbose when -v is specified (by dbjh)
- updated (SNES) made -k, -f & -l more verbose when -v is specified (by dbjh)
- updated (Genesis & PCE) made -f more verbose when -v is specified (by dbjh)
- updated (all) fixed bug in code of --pattern that caused changes to be
omitted in the output file (by dbjh)
- added (SNES & Genesis) --smgh split ROM for MGH. Its main purpose is
splitting SNES HiROM games in MGH format. Splitting is required to make them
run with an MGH (by dbjh, thanks to Mystic_Merlin for information and testing)
- added (SNES & Genesis) --mgh convert to Magic Game Hunter/MGH format. For
SNES this does the same as --gd3, except that the resulting file will have an
MGH name and no header. For Genesis this does something very similar to --mgd,
but the resulting file will have an MGH name. For both consoles an MGH name
file will be produced (by dbjh, thanks to Mystic_Merlin for information and
testing)
- updated (NES, SNES, Genesis & NeoGeo Pocket) fixed --ns (by dbjh)
- updated (SNES) fixed bug in checksum calculation code if the cartridge size
byte of the internal header is 0 (by dbjh, thanks to Mystic_Merlin for
providing the PD ROM that triggered the bug)
- updated (SNES) added support for a few more cartridge configurations to
--ufosd. Still more information is needed, specifically about the header of 8
Mbit HiROMs (by dbjh, thanks to Mystic_Merlin for sending the output of --dbuh
for dumps made with his UFO SD)
- updated (SNES) --ufosd fixes the checksum and pads the output to a valid size
for the UFO SD (by dbjh, thanks to Mystic_Merlin for information and testing)
- added (N64) support for Nintendo 64 DAT files containing CRC32 values of ROMs
in Mr. Backup Z64 format, like what DAT-o-MATIC produces. It can be turned on
by setting the property variable n64_dat_v64 to 0. See the FAQ question 57 (by
dbjh)
- updated (all) fixed double suffix issue when using DAT-o-MATIC DAT files (by
dbjh; thanks to eadmaster for reporting the issue)
- updated (SNES) completed --ufosd by adding support for 8 Mbit HiROM (by dbjh,
thanks to Mystic_Merlin and cage for the information)
diffstat:
emulators/ucon64/Makefile | 8 +-
emulators/ucon64/PLIST | 8 +-
emulators/ucon64/distinfo | 19 +-
emulators/ucon64/patches/patch-Makefile | 15 +
emulators/ucon64/patches/patch-aa | 24 --
emulators/ucon64/patches/patch-ab | 13 -
emulators/ucon64/patches/patch-ac | 14 -
emulators/ucon64/patches/patch-ad | 15 -
emulators/ucon64/patches/patch-ae | 14 -
emulators/ucon64/patches/patch-af | 146 ---------------
emulators/ucon64/patches/patch-libdiscmage_libdiscmage.h | 15 +
emulators/ucon64/patches/patch-misc_unzip.h | 16 +
12 files changed, 63 insertions(+), 244 deletions(-)
diffs (truncated from 396 to 300 lines):
diff -r 5eb0667238ee -r 0134646266b9 emulators/ucon64/Makefile
--- a/emulators/ucon64/Makefile Sun Mar 04 15:07:45 2018 +0000
+++ b/emulators/ucon64/Makefile Sun Mar 04 15:20:02 2018 +0000
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile,v 1.10 2012/10/03 12:55:20 asau Exp $
-#
+# $NetBSD: Makefile,v 1.11 2018/03/04 15:20:02 wiz Exp $
-DISTNAME= ucon64-2.0.0-src
+DISTNAME= ucon64-2.1.0-src
PKGNAME= ${DISTNAME:S/-src//}
-PKGREVISION= 2
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ucon64/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://ucon64.sourceforge.net/
COMMENT= Emulator ROM and disk image converter and inspector
+LICENSE= gnu-gpl-v2
WRKSRC= ${WRKDIR}/${DISTNAME}/src
-CONFIGURE_ARGS+= --disable-discmage # requires some work
CONFIGURE_ARGS+= --disable-dload
CPPFLAGS+= -D__unix__
GNU_CONFIGURE= yes
diff -r 5eb0667238ee -r 0134646266b9 emulators/ucon64/PLIST
--- a/emulators/ucon64/PLIST Sun Mar 04 15:07:45 2018 +0000
+++ b/emulators/ucon64/PLIST Sun Mar 04 15:20:02 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:51:09 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/03/04 15:20:02 wiz Exp $
bin/ucon64
share/doc/ucon64/changes.html
share/doc/ucon64/developers.html
@@ -6,6 +6,7 @@
share/doc/ucon64/hardware.html
share/doc/ucon64/images/bg.jpg
share/doc/ucon64/images/cameralink.png
+share/doc/ucon64/images/cd64.png
share/doc/ucon64/images/cd_rw.png
share/doc/ucon64/images/dexdrive.png
share/doc/ucon64/images/f2a.png
@@ -13,16 +14,19 @@
share/doc/ucon64/images/fig.png
share/doc/ucon64/images/gbx.png
share/doc/ucon64/images/ggpro.png
-share/doc/ucon64/images/hr.png
share/doc/ucon64/images/icon.png
share/doc/ucon64/images/logo.png
share/doc/ucon64/images/mdpro.png
share/doc/ucon64/images/msg.png
share/doc/ucon64/images/pcepro.png
+share/doc/ucon64/images/qd16.png
+share/doc/ucon64/images/sc.png
share/doc/ucon64/images/sf3.png
+share/doc/ucon64/images/sflash.png
share/doc/ucon64/images/smc.png
share/doc/ucon64/images/smd.png
share/doc/ucon64/images/smspro.png
+share/doc/ucon64/images/snesppak.png
share/doc/ucon64/images/swc.png
share/doc/ucon64/images/v64.png
share/doc/ucon64/images/v64jr.png
diff -r 5eb0667238ee -r 0134646266b9 emulators/ucon64/distinfo
--- a/emulators/ucon64/distinfo Sun Mar 04 15:07:45 2018 +0000
+++ b/emulators/ucon64/distinfo Sun Mar 04 15:20:02 2018 +0000
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 20:31:10 agc Exp $
+$NetBSD: distinfo,v 1.8 2018/03/04 15:20:02 wiz Exp $
-SHA1 (ucon64-2.0.0-src.tar.gz) = 8782bbc2bf5760fafe3fa4cd02b67991d984a973
-RMD160 (ucon64-2.0.0-src.tar.gz) = c28921cfae1a010db917b96be542c089690b374c
-SHA512 (ucon64-2.0.0-src.tar.gz) = d021fe6db9530405773e1e209bdfafe41a2bd997f275ca7fb387f9b3d8639f4581c2761cbdce859a1831d6eba9dab4d5df1019605698c6cb6a4695ab091b001c
-Size (ucon64-2.0.0-src.tar.gz) = 1188488 bytes
-SHA1 (patch-aa) = fd1543314b6ca6d432c6d88b8b7590085dfc51e9
-SHA1 (patch-ab) = 25f5311844511674d5e64efe7c35cf86dacc34a9
-SHA1 (patch-ac) = 9c7febe59e1c8e6959f56e34ced83a31fa54c294
-SHA1 (patch-ad) = c41895de15bc2a48bf5de1535f03d070ade79ea3
-SHA1 (patch-ae) = bfb38ecec2408deaaef881fa33943e2c45bccd4d
-SHA1 (patch-af) = 2f53d87dd40dfdfd90580161444d956df32207df
+SHA1 (ucon64-2.1.0-src.tar.gz) = 83506c965ba4ab6fa7122c9dcebbabe6c553cbc3
+RMD160 (ucon64-2.1.0-src.tar.gz) = b3b6b95a44cb50ac7e3634d07b1b50960fb971f8
+SHA512 (ucon64-2.1.0-src.tar.gz) = da2dbe8a573e7dc779f69859f4d3508d4818dcfd99b6b397a7b23a2038a1d8c85835fae9e237a1639ec6179e8ceabb95fd0d65f95f963de99bc61024f686580e
+Size (ucon64-2.1.0-src.tar.gz) = 1348408 bytes
+SHA1 (patch-Makefile) = 6e9ad6f6c02d109aee3a71f7abb3b68d43cedf15
+SHA1 (patch-libdiscmage_libdiscmage.h) = 07a52a12091c8220ba5fa50fd7926e77c772208d
+SHA1 (patch-misc_unzip.h) = 25434ddffb3ff1f5d69530ff08d70791bd4ac2ba
diff -r 5eb0667238ee -r 0134646266b9 emulators/ucon64/patches/patch-Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/ucon64/patches/patch-Makefile Sun Mar 04 15:20:02 2018 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile,v 1.1 2018/03/04 15:20:02 wiz Exp $
+
+Do not hardcode -O3.
+
+--- Makefile.orig 2017-08-05 23:02:35.000000000 +0000
++++ Makefile
+@@ -2,7 +2,7 @@
+
+ CC=gcc
+ CFLAGS0:=$(CFLAGS)
+-CFLAGS+=-I. -Wall -W -O3
++CFLAGS+=-I. -Wall -W
+ LDFLAGS0:=$(LDFLAGS)
+ ifeq ($(findstring darwin,$(OSTYPE)),) # false if OSTYPE contains "darwin"
+ # On Mac OS X using -s gives the following warning:
diff -r 5eb0667238ee -r 0134646266b9 emulators/ucon64/patches/patch-aa
--- a/emulators/ucon64/patches/patch-aa Sun Mar 04 15:07:45 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/07/26 04:12:22 tv Exp $
-
---- Makefile.in.orig 2004-09-05 10:32:27.000000000 -0400
-+++ Makefile.in
-@@ -7,8 +7,8 @@
- @DEFINE_LIBCD64_MAKE@
-
- CC=@CC@
--CFLAGS=-I. -Wall -W -O3 @DEFS@
--LDFLAGS=-s
-+CFLAGS=-I. -Wall -W @CPPFLAGS@ @CFLAGS@ @DEFS@
-+LDFLAGS=@LDFLAGS@
- TARGETS=
-
- ifdef USE_DISCMAGE
-@@ -76,7 +76,7 @@ endif
- else # DLOPEN
- ifdef USE_DISCMAGE # GNU specific: "simply expanded variable"
- FULLLIBNAME_DM:=$(addprefix lib,$(FULLLIBNAME_DM))
--LDFLAGS+=-Llibdiscmage -l$(LIBNAME_DM)
-+LDFLAGS+=-Llibdiscmage -l$(LIBNAME_DM) -lm
- endif
-
- endif
diff -r 5eb0667238ee -r 0134646266b9 emulators/ucon64/patches/patch-ab
--- a/emulators/ucon64/patches/patch-ab Sun Mar 04 15:07:45 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/07/26 04:12:22 tv Exp $
-
---- libdiscmage/libdiscmage.h.orig 2005-07-25 18:00:47.000000000 -0400
-+++ libdiscmage/libdiscmage.h
-@@ -28,7 +28,7 @@ extern "C" {
-
- #include <stdio.h> // FILENAME_MAX
-
--#if defined __linux__ || defined __FreeBSD__ || defined __OpenBSD__ || \
-+#if defined __linux__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__ || \
- defined __solaris__ || defined __MINGW32__ || defined __CYGWIN__ || \
- defined __BEOS__ || defined AMIGA || defined __APPLE__ // Mac OS X actually
- // We cannot use config.h (for HAVE_INTTYPES_H), because this header file may be
diff -r 5eb0667238ee -r 0134646266b9 emulators/ucon64/patches/patch-ac
--- a/emulators/ucon64/patches/patch-ac Sun Mar 04 15:07:45 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2005/07/26 04:12:22 tv Exp $
-
---- misc/unzip.h.orig 2004-07-28 13:27:22.000000000 -0400
-+++ misc/unzip.h
-@@ -48,6 +48,9 @@ extern "C" {
- #ifndef _ZLIB_H
- #include "zlib.h"
- #endif
-+#ifndef OF
-+#define OF(x) x
-+#endif
-
- #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
- /* like the STRICT of WIN32, we define a pointer that cannot be converted
diff -r 5eb0667238ee -r 0134646266b9 emulators/ucon64/patches/patch-ad
--- a/emulators/ucon64/patches/patch-ad Sun Mar 04 15:07:45 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/12/09 11:48:11 joerg Exp $
-
---- misc/file.c.orig 2005-12-09 11:37:31.000000000 +0000
-+++ misc/file.c
-@@ -90,10 +90,6 @@ Foundation, Inc., 675 Mass Ave, Cambridg
- #define inline __inline
- #endif
-
--
--extern int errno;
--
--
- int
- isfname (int c)
- {
diff -r 5eb0667238ee -r 0134646266b9 emulators/ucon64/patches/patch-ae
--- a/emulators/ucon64/patches/patch-ae Sun Mar 04 15:07:45 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/12/09 11:48:11 joerg Exp $
-
---- misc/misc.c.orig 2005-12-09 11:41:00.000000000 +0000
-+++ misc/misc.c
-@@ -88,9 +88,6 @@ typedef struct termios tty_t;
- #endif // MAXBUFSIZE
- #define MAXBUFSIZE 32768
-
--
--extern int errno;
--
- typedef struct st_func_node
- {
- void (*func) (void);
diff -r 5eb0667238ee -r 0134646266b9 emulators/ucon64/patches/patch-af
--- a/emulators/ucon64/patches/patch-af Sun Mar 04 15:07:45 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,146 +0,0 @@
-$NetBSD: patch-af,v 1.3 2012/07/18 22:10:21 marino Exp $
-
-- don't declare own errno
-- fix build failure where gzgetc() is a macro (seen in a recent Linux
- bulk build)
-
-XXX: what this code is doing (mixing gzFile* and FILE* indiscriminately
-XXX: without even casting) is vile and will probably stop compiling at
-XXX: some point.
-
-JRM: That point arrived. The garbage spewed when compiled with
-JRM: zlib >= 1.2.6. Cast gzFile everywhere to fix it.
-JRM: David's gzgetc fix was changed; it broke too.
-
---- misc/archive.c.orig 2004-12-12 01:16:54.000000000 +0000
-+++ misc/archive.c
-@@ -48,9 +48,6 @@ Foundation, Inc., 675 Mass Ave, Cambridg
- #define MAXBUFSIZE 32768
-
-
--extern int errno;
--
--
- int
- fsizeof (const char *filename)
- // If USE_ZLIB is defined this function is very slow. Please avoid to use
-@@ -84,15 +81,15 @@ fsizeof (const char *filename)
- }
- #if 1
- // This is not much faster than the other method
-- while (!gzeof (file))
-- gzseek (file, 1024 * 1024, SEEK_CUR);
-- size = gztell (file);
-+ while (!gzeof ((gzFile)file))
-+ gzseek ((gzFile)file, 1024 * 1024, SEEK_CUR);
-+ size = gztell ((gzFile)file);
- #else
- // Is there a more efficient way to determine the uncompressed size?
- while ((bytesread = gzread (file, buf, MAXBUFSIZE)) > 0)
- size += bytesread;
- #endif
-- gzclose (file);
-+ gzclose ((gzFile)file);
- return size;
- }
- else if (magic[0] == 'P' && magic[1] == 'K' && magic[2] == 0x03 && magic[3] == 0x04)
-@@ -384,7 +381,7 @@ fclose2 (FILE *file)
- if (fmode == FM_NORMAL)
- return fclose (file);
- else if (fmode == FM_GZIP)
-- return gzclose (file);
-+ return gzclose ((gzFile)file);
- else if (fmode == FM_ZIP)
- {
- unzCloseCurrentFile (file);
-@@ -416,12 +413,12 @@ fseek2 (FILE *file, long offset, int mod
- if (mode == SEEK_END) // zlib doesn't support SEEK_END
- {
- // Note that this is _slow_...
-- while (!gzeof (file))
-+ while (!gzeof ((gzFile)file))
- {
-- gzgetc (file); // necessary for _uncompressed_ files in order to set EOF
-- gzseek (file, 1024 * 1024, SEEK_CUR);
-+ gzgetc ((gzFile)file); // necessary for _uncompressed_ files in order to set EOF
-+ gzseek ((gzFile)file, 1024 * 1024, SEEK_CUR);
- }
-- offset += gztell (file);
-+ offset += gztell ((gzFile)file);
- mode = SEEK_SET;
- }
- /*
-@@ -433,8 +430,8 @@ fseek2 (FILE *file, long offset, int mod
- DJGPP, Cygwin & GNU/Linux). It clears the EOF indicator.
- */
- if (!finfo->compressed)
-- gzrewind (file);
-- return gzseek (file, offset, mode) == -1 ? -1 : 0;
-+ gzrewind ((gzFile)file);
-+ return gzseek ((gzFile)file, offset, mode) == -1 ? -1 : 0;
- }
- else if (finfo->fmode == FM_ZIP)
- {
-@@ -476,7 +473,7 @@ fread2 (void *buffer, size_t size, size_
- return fread (buffer, size, number, file);
- else if (fmode == FM_GZIP)
- {
-- int n = gzread (file, buffer, number * size);
-+ int n = gzread ((gzFile)file, buffer, number * size);
Home |
Main Index |
Thread Index |
Old Index