aboutsummaryrefslogtreecommitdiffstats
path: root/wsutil
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2016-04-01 01:32:56 +0100
committerAnders Broman <a.broman58@gmail.com>2016-04-04 06:58:41 +0000
commit6f98a0fac33db70b3ceb71d939b0a9d0d47747cc (patch)
treef4769e5888fca9bd30cde35aabad4542849e9c4f /wsutil
parente005bc819c201c49cf330a2607ad0770f145904e (diff)
Rename "libz" to "zlib"
Change-Id: I12f92c983d587c2a4751428cdf299635090c9f0b Reviewed-on: https://code.wireshark.org/review/14748 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wsutil')
-rw-r--r--wsutil/ws_version_info.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/wsutil/ws_version_info.c b/wsutil/ws_version_info.c
index e479ab1942..84c2edd06c 100644
--- a/wsutil/ws_version_info.c
+++ b/wsutil/ws_version_info.c
@@ -33,7 +33,7 @@
#include <glib.h>
-#ifdef HAVE_LIBZ
+#ifdef HAVE_ZLIB
#include <zlib.h>
#endif
@@ -78,15 +78,15 @@ end_string(GString *str)
static const gchar *
get_zlib_compiled_version_info(void)
{
-#ifdef HAVE_LIBZ
+#ifdef HAVE_ZLIB
#ifdef ZLIB_VERSION
- return "with libz "ZLIB_VERSION;
+ return "with zlib "ZLIB_VERSION;
#else
- return "with libz (version unknown)";
+ return "with zlib (version unknown)";
#endif /* ZLIB_VERSION */
#else
- return "without libz";
-#endif /* HAVE_LIBZ */
+ return "without zlib";
+#endif /* HAVE_ZLIB */
}
/*
@@ -355,8 +355,8 @@ get_runtime_version_info(void (*additional_info)(GString *))
(*additional_info)(str);
/* zlib */
-#if defined(HAVE_LIBZ) && !defined(_WIN32)
- g_string_append_printf(str, ", with libz %s", zlibVersion());
+#if defined(HAVE_ZLIB) && !defined(_WIN32)
+ g_string_append_printf(str, ", with zlib %s", zlibVersion());
#endif
g_string_append(str, ".");