summaryrefslogtreecommitdiff
path: root/wiretap/wtap.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-12-16 08:59:01 +0000
committerGuy Harris <guy@alum.mit.edu>2015-12-16 08:59:07 +0000
commit6d60c4d4684c2c03a43f1b8720497348cf17d357 (patch)
tree31c4eeb27100d4d42d942b85a8178cb167cf91d8 /wiretap/wtap.c
parentbfe73e3ad7162830c222a5b0d73433a72324baa5 (diff)
downloadwireshark-6d60c4d4684c2c03a43f1b8720497348cf17d357.tar.gz
Revert "Make zlib API constness-aware"
This reverts commit fb0246c6fd7cd34b820558f75eb48bba6326b768. That commit assumes that if you define Z_CONST, z_const will be defined; that is *not* the case with older versions of zlib, which don't define z_const under any circumstances. Change-Id: I6f9b7ea18922799b1aaf94dc2c63120128f2550a Reviewed-on: https://code.wireshark.org/review/12671 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/wtap.c')
-rw-r--r--wiretap/wtap.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index c4c35e8a74..30b66cd46f 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -27,6 +27,10 @@
#include <sys/types.h>
#endif
+#ifdef HAVE_LIBZ
+#include <zlib.h>
+#endif
+
#include "wtap-int.h"
#include "file_wrappers.h"