Remove unnecessary gzgetc_ function.
This commit is contained in:
parent
9894494537
commit
1a4ba8cd91
10
gzread.c
10
gzread.c
@ -373,7 +373,8 @@ int ZEXPORT gzread(file, buf, len)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
int ZEXPORT gzgetc_(file)
|
#undef gzgetc
|
||||||
|
int ZEXPORT gzgetc(file)
|
||||||
gzFile file;
|
gzFile file;
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
@ -402,13 +403,6 @@ int ZEXPORT gzgetc_(file)
|
|||||||
return ret < 1 ? -1 : buf[0];
|
return ret < 1 ? -1 : buf[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
#undef gzgetc
|
|
||||||
int ZEXPORT gzgetc(file)
|
|
||||||
gzFile file;
|
|
||||||
{
|
|
||||||
return gzgetc_(file);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* -- see zlib.h -- */
|
/* -- see zlib.h -- */
|
||||||
int ZEXPORT gzungetc(c, file)
|
int ZEXPORT gzungetc(c, file)
|
||||||
int c;
|
int c;
|
||||||
|
5
zlib.h
5
zlib.h
@ -1650,14 +1650,13 @@ struct gzFile_s {
|
|||||||
unsigned char *next;
|
unsigned char *next;
|
||||||
z_off64_t pos;
|
z_off64_t pos;
|
||||||
};
|
};
|
||||||
ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));
|
|
||||||
#ifdef Z_PREFIX_SET
|
#ifdef Z_PREFIX_SET
|
||||||
# undef z_gzgetc
|
# undef z_gzgetc
|
||||||
# define z_gzgetc(g) \
|
# define z_gzgetc(g) \
|
||||||
((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc_(g))
|
((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
|
||||||
#else
|
#else
|
||||||
# define gzgetc(g) \
|
# define gzgetc(g) \
|
||||||
((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc_(g))
|
((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
|
/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
|
||||||
|
Loading…
Reference in New Issue
Block a user