From 5851b8aa40a146f7cdf5314eece4e55867131b00 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Tue, 10 Apr 2007 17:57:47 +0000 Subject: [PATCH] remove dependency on zlib.h svn path=/trunk/; revision=21370 --- epan/dissectors/packet-ssl-utils.c | 13 +++++++++++++ epan/dissectors/packet-ssl-utils.h | 11 +---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 8948337d8c..5db2dd19d2 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -34,6 +34,19 @@ #include +/* we keep this internal to packet-ssl-utils, as there should be + no need to access it any other way. + + This also allows us to hide the dependency on zlib. +*/ +struct _SslDecompress { + gint compression; +#ifdef HAVE_LIBZ + z_stream istream; +#endif +}; + + static gint ver_major, ver_minor, ver_patch; void diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index 9f6cb3037f..48137c06ff 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -29,10 +29,6 @@ #include #include -#ifdef HAVE_LIBZ -#include -#endif - #ifdef HAVE_LIBGNUTLS #ifdef _WIN32 #include @@ -591,12 +587,7 @@ typedef struct _SslFlow { emem_tree_t *multisegment_pdus; } SslFlow; -typedef struct _SslDecompress { - gint compression; -#ifdef HAVE_LIBZ - z_stream istream; -#endif -} SslDecompress; +typedef struct _SslDecompress SslDecompress; typedef struct _SslDecoder { SslCipherSuite* cipher_suite;