summaryrefslogtreecommitdiff
path: root/mergecap.c
diff options
context:
space:
mode:
authorJoerg Mayer <jmayer@loplof.de>2016-03-28 15:25:12 +0200
committerJörg Mayer <jmayer@loplof.de>2016-03-28 13:27:52 +0000
commit7e5dae90d65ed062f2d01c63174cc1c94850a19a (patch)
tree1a0ba5c8421a916ad3a746b20fd1e4b063df89b4 /mergecap.c
parent8f3ad919054003ea96c670ab663268b75aba3755 (diff)
downloadwireshark-7e5dae90d65ed062f2d01c63174cc1c94850a19a.tar.gz
Fix warnings/errors of type -Wused-but-marked-unused
Change-Id: I34c2d9953272822da0745d1b24c64d8466e43b37 Reviewed-on: https://code.wireshark.org/review/14668 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'mergecap.c')
-rw-r--r--mergecap.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/mergecap.c b/mergecap.c
index e0e4048ccc..f6fad775e3 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -195,7 +195,12 @@ get_mergecap_compiled_info(GString *str)
}
static void
-get_mergecap_runtime_info(GString *str _U_)
+get_mergecap_runtime_info(
+#if defined(HAVE_LIBZ) && !defined(_WIN32)
+ GString *str)
+#else
+ GString *str _U_)
+#endif
{
/* zlib */
#if defined(HAVE_LIBZ) && !defined(_WIN32)