diff options
| author | Toon Claes <toon@iotcl.com> | 2025-03-07 15:18:08 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-03-07 12:23:30 -0800 |
| commit | 2b1e0f8cd5058c7e0b85760e54706b9e74cb4766 (patch) | |
| tree | 812bbc2f9cd054aafa9d70f83fdf4758baaae0d1 /help.c | |
| parent | help: include git-zlib.h to print zlib version (diff) | |
| download | git-2b1e0f8cd5058c7e0b85760e54706b9e74cb4766.tar.gz git-2b1e0f8cd5058c7e0b85760e54706b9e74cb4766.zip | |
help: print zlib-ng version number
When building against zlib-ng, the header file `zlib.h` is not included,
but `zlib-ng.h` is included instead. It's `zlib.h` that defines
`ZLIB_VERSION` and that macro is used to print out zlib version in
`git-version(1)` with `--build-options`. But when it's not defined, no
version is printed.
`zlib-ng.h` defines another macro: `ZLIBNG_VERSION`. Use that macro to
print the zlib-ng version in `git version --build-options` when it's
set. Otherwise fallback to `ZLIB_VERSION`.
Signed-off-by: Toon Claes <toon@iotcl.com>
Helped-by: Patrick Steinhardt <ps@pks.im>
Reviewed-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'help.c')
| -rw-r--r-- | help.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -776,7 +776,9 @@ void get_version_info(struct strbuf *buf, int show_build_options) #if defined OPENSSL_VERSION_TEXT strbuf_addf(buf, "OpenSSL: %s\n", OPENSSL_VERSION_TEXT); #endif -#if defined ZLIB_VERSION +#if defined ZLIBNG_VERSION + strbuf_addf(buf, "zlib-ng: %s\n", ZLIBNG_VERSION); +#elif defined ZLIB_VERSION strbuf_addf(buf, "zlib: %s\n", ZLIB_VERSION); #endif } |