pkgsrc/security/ssldump/patches/patch-ab

$NetBSD: patch-ab,v 1.3 2011/10/01 11:36:12 shattered Exp $

--- base/pcap-snoop.c.orig	2002-09-09 21:02:58.000000000 +0000
+++ base/pcap-snoop.c
@@ -48,7 +48,12 @@ static char *RCSSTRING="$Id: pcap-snoop.
 
 
-#include <pcap.h>
 #include <unistd.h>
+#if !defined(__DragonFly__) && !defined(__APPLE__)
 #include <net/bpf.h>
+#endif
+#if defined(__NetBSD__)
+#define PCAP_DONT_INCLUDE_PCAP_BPF_H
+#endif
+#include <pcap.h>
 #ifndef _WIN32
 #include <sys/param.h>
Fix build on -current. 2011-10-01 13:36:11 +02:00			$NetBSD: patch-ab,v 1.3 2011/10/01 11:36:12 shattered Exp $
Don't include both net/bpf.h and pcap.h on DragonFly. XXX Are both needed on any platform at all? 2006-05-12 11:54:52 +02:00
Fix build on -current. 2011-10-01 13:36:11 +02:00			`--- base/pcap-snoop.c.orig 2002-09-09 21:02:58.000000000 +0000`
Don't include both net/bpf.h and pcap.h on DragonFly. XXX Are both needed on any platform at all? 2006-05-12 11:54:52 +02:00			`+++ base/pcap-snoop.c`
Fix build on -current. 2011-10-01 13:36:11 +02:00			`@@ -48,7 +48,12 @@ static char *RCSSTRING="$Id: pcap-snoop.`
Don't include both net/bpf.h and pcap.h on DragonFly. XXX Are both needed on any platform at all? 2006-05-12 11:54:52 +02:00
Fix build on -current. 2011-10-01 13:36:11 +02:00
			`-#include <pcap.h>`
Don't include both net/bpf.h and pcap.h on DragonFly. XXX Are both needed on any platform at all? 2006-05-12 11:54:52 +02:00			`#include <unistd.h>`
Don't pull in <net/bpf.h> on MacOS, it's already pulled in via libpcap. XXX Still needs PREFER.libpcap=pkgsrc in mk.conf to build, but it's a step forward. 2007-06-17 03:40:51 +02:00			`+#if !defined(__DragonFly__) && !defined(__APPLE__)`
Don't include both net/bpf.h and pcap.h on DragonFly. XXX Are both needed on any platform at all? 2006-05-12 11:54:52 +02:00			`#include <net/bpf.h>`
			`+#endif`
Fix build on -current. 2011-10-01 13:36:11 +02:00			`+#if defined(__NetBSD__)`
			`+#define PCAP_DONT_INCLUDE_PCAP_BPF_H`
			`+#endif`
			`+#include <pcap.h>`
Don't include both net/bpf.h and pcap.h on DragonFly. XXX Are both needed on any platform at all? 2006-05-12 11:54:52 +02:00			`#ifndef _WIN32`
			`#include <sys/param.h>`