Merge remote-tracking branch 'upstream/master'

[tcpdump] / bpf_dump.c

diff --git a/bpf_dump.c b/bpf_dump.c
index d928161edf8f2539e5f32f22087cd94a98c9a563..b50d7e7b66398b2152790fc7cd95052493067db2 100644 (file)
--- a/bpf_dump.c
+++ b/bpf_dump.c
@@ -19,16 +19,15 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 #ifndef lint
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/bpf_dump.c,v 1.11 2000-06-18 11:12:59 assar Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/bpf_dump.c,v 1.17 2008-02-14 20:53:49 guy Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <sys/types.h>
-#include <sys/time.h>
+#include <tcpdump-stdinc.h>

 
 #include <pcap.h>
 #include <stdio.h>
 
 #include <pcap.h>
 #include <stdio.h>


@@ -36,7 +35,7 @@ static const char rcsid[] =
 #include "interface.h"
 
 void
 #include "interface.h"
 
 void

-bpf_dump(struct bpf_program *p, int option)
+bpf_dump(const struct bpf_program *p, int option)

 {
        struct bpf_insn *insn;
        int i;
 {
        struct bpf_insn *insn;
        int i;