diff options
| author | Daniël van Eeden <git@myname.nl> | 2016-03-26 13:03:39 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-03-26 16:19:34 +0000 |
| commit | a0b1354583797e713000810ec7d9b2f73ae59ec5 (patch) | |
| tree | e446e42f0a1ef772f8bf8d0f61e28634952b3f67 /mergecap.c | |
| parent | 320090ce23f4bef644b3b5f2461bdba032518960 (diff) | |
Fix compile errors when compiling w/o zlib
Change-Id: I443cd0d4a143e456e11b5939891312a0501770a0
Reviewed-on: https://code.wireshark.org/review/14636
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mergecap.c b/mergecap.c index 7d2d696868..e0e4048ccc 100644 --- a/mergecap.c +++ b/mergecap.c @@ -195,7 +195,7 @@ get_mergecap_compiled_info(GString *str) } static void -get_mergecap_runtime_info(GString *str) +get_mergecap_runtime_info(GString *str _U_) { /* zlib */ #if defined(HAVE_LIBZ) && !defined(_WIN32) |