mirror of
https://github.com/git/git.git
synced 2026-01-09 01:34:00 +00:00
git-zlib: use struct z_stream_s instead of typedef
Throughout the Git codebase we're using the typedeffed version of `z_stream`, which maps to `struct z_stream_s`. By using a typedef instead of the struct it becomes somewhat harder to predeclare the symbol so that headers depending on the struct can do so without having to pull in "zlib-compat.h". We don't yet have users that would really care about this: the only users that declare `z_stream` as a pointer are in "reftable/block.h", which is a header that is internal to the reftable library. But in the next step we're going to expose the `struct reftable_block` publicly, and that struct does contain a pointer to `z_stream`. And as the public header shouldn't depend on "reftable/system.h", which is an internal implementation detail, we won't have the typedef for `z_stream` readily available. Prepare for this change by using `struct z_stream_s` throughout our code base. In case zlib-ng is used we use a define to map from `z_stream_s` to `zng_stream_s`. Drop the pre-declaration of `struct z_stream` while at it. This struct does not exist in the first place, and the declaration wasn't needed because "reftable/block.h" already includes "reftable/basics.h" which transitively includes "reftable/system.h" and thus "git-zlib.h". Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
12a9aa8cb7
commit
ce76cec964
@@ -4,8 +4,8 @@
|
||||
#ifdef HAVE_ZLIB_NG
|
||||
# include <zlib-ng.h>
|
||||
|
||||
# define z_stream zng_stream
|
||||
#define gz_header_s zng_gz_header_s
|
||||
# define z_stream_s zng_stream_s
|
||||
# define gz_header_s zng_gz_header_s
|
||||
|
||||
# define crc32(crc, buf, len) zng_crc32(crc, buf, len)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user