qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-14 17:01:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correct the usage of gzFile.

Browse source 
Thanks to spirit for pointing that QF wasn't compiling with zlib 1.2.6
(archlinux, not yet in debian).

I was using gzFile as "gzFile *gzfile", but gzFile is already a pointer. In
older versions of zlib (including the 1.2.3 that's in debian), gzFile is
declared as a void *, and it seems that gcc is happy with assigning void **
to void *. However, in recent zlib, gzFile is now struct gzFile_s *, which
gcc is most definitely unhappy about assigning to struct gzFile **.

I just hope that either I had misread the type back when I wrote quakeio,
or that nobody is using such an ancient zlib.
This commit is contained in:
Bill Currie 2012-02-13 09:00:31 +09:00
parent dd6ff1fde2
commit d8a37bc791
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/util/quakeio.c
View file

@ -80,7 +80,7 @@ static __attribute__ ((used)) const char rcsid[] =
struct QFile_s { struct QFile_s {
FILE *file; FILE *file;
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
gzFile *gzfile; gzFile gzfile;
#endif #endif
off_t size; off_t size;
off_t start; off_t start;