From 6f98a0fac33db70b3ceb71d939b0a9d0d47747cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= <joao.valverde@tecnico.ulisboa.pt>
Date: Fri, 1 Apr 2016 01:32:56 +0100
Subject: Rename "libz" to "zlib"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 wsutil/ws_version_info.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'wsutil')

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, ".");
-- 
cgit v1.2.3