From 7a36bede0b7367182c6dfbfa4e0352566df885c4 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Thu, 13 Jan 2000 07:09:20 +0000 Subject: We are obliged to define HAVE_UNISTD_H in "config.h"; to avoid the hideous problem on FreeBSD 3.[23] (and perhaps other BSDs) if HAVE_UNISTD_H is defined before "zlib.h" is included, turn "file_seek()" into a subroutine defined in a file that *undefines* HAVE_UNISTD_H before including "zlib.h", so that the *only* call to "gzseek()" is made from a file that does not have HAVE_UNISTD_H defined when it includes "zlib.h". Move "file_error()" to that file while you're at it, so it holds all the wrappers that hide the presence or absence of zlib from routines to read capture files. Turn "file.h", which declared those wrapper functions as well as wrapper macros, into "file_wrapper.h" - it belongs with the "file_wrapper.c" file that defines the wrapper functions, not with "file.c" which handles higher-layer file access functions. Remove the comment in "configure.in" that explained why defining HAVE_UNISTD_H was a bad idea, as we're not obliged to define it and work around the problem. (The comment in "file_wrapper.c" explains the workaround.) svn path=/trunk/; revision=1463 --- wiretap/libpcap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wiretap/libpcap.c') diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index c9c8efba0a..ddd15e9b78 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -1,6 +1,6 @@ /* libpcap.c * - * $Id: libpcap.c,v 1.29 2000/01/09 07:55:48 guy Exp $ + * $Id: libpcap.c,v 1.30 2000/01/13 07:09:17 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez @@ -26,7 +26,7 @@ #include #include #include "wtap.h" -#include "file.h" +#include "file_wrappers.h" #include "buffer.h" #include "libpcap.h" -- cgit v1.2.3