33,34c33,34
< * $FreeBSD: head/contrib/libpcap/pcap-int.h 146771 2005-05-29 18:09:04Z sam $
< * @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.68 2004/12/18 08:52:10 guy Exp $ (LBL)
---
> * $FreeBSD: head/contrib/libpcap/pcap-int.h 147897 2005-07-11 03:43:25Z sam $
> * @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.68.2.2 2005/05/03 18:54:36 guy Exp $ (LBL)
102a103,110
> /*
> * Ultrix, DEC OSF/1^H^H^H^H^H^H^H^H^HDigital UNIX^H^H^H^H^H^H^H^H^H^H^H^H
> * Tru64 UNIX, and NetBSD pad to make everything line up on a nice boundary.
> */
> #if defined(ultrix) || defined(__osf__) || (defined(__NetBSD__) && __NetBSD_Version__ > 106000000)
> #define PCAP_FDDIPAD 3
> #endif
>
145a154,156
> /* We're accepting only packets in this direction/these directions. */
> direction_t direction;
>
151a163
> int (*setdirection_op)(pcap_t *, direction_t);
242,248c254,258
<
< /*
< * Ultrix, DEC OSF/1^H^H^H^H^H^H^H^H^HDigital UNIX^H^H^H^H^H^H^H^H^H^H^H^H
< * Tru64 UNIX, and NetBSD pad to make everything line up on a nice boundary.
< */
< #if defined(ultrix) || defined(__osf__) || defined(__NetBSD__)
< #define PCAP_FDDIPAD 3
---
> #ifndef HAVE_STRLCPY
> #define strlcpy(x, y, z) \
> (strncpy((x), (y), (z)), \
> ((z) <= 0 ? 0 : ((x)[(z) - 1] = '\0')), \
> strlen((y)))