<pcap.h> includes <sys/types.h> and <sys/time.h>; there's no need to

include it in these files, as they either include "pcap-int.h", which
includes <pcap.h>, or they include <pcap.h> directly.

diff --git a/bpf_dump.c b/bpf_dump.c
index 0b651c2a494f16b6a6a3058a90f874760cf143f0..a808db97fcabe1680ea387af31d71b2a9089fd2f 100644 (file)
--- a/bpf_dump.c
+++ b/bpf_dump.c
@@ -20,16 +20,13 @@
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/bpf_dump.c,v 1.12 2000-06-26 04:17:05 assar Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/bpf_dump.c,v 1.12.4.1 2002-03-24 23:25:37 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <sys/types.h>
-#include <sys/time.h>
-
 #include <pcap.h>
 #include <stdio.h>
 

diff --git a/bpf_image.c b/bpf_image.c
index ab225eda2ad1e177cece418476e2d797aabe28b5..32980d1327448a3bc2108605cdebb12c12279e41 100644 (file)
--- a/bpf_image.c
+++ b/bpf_image.c
@@ -21,16 +21,13 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/bpf_image.c,v 1.24 2000-07-11 00:37:04 assar Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/bpf_image.c,v 1.24.4.1 2002-03-24 23:25:37 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <sys/types.h>
-#include <sys/time.h>
-
 #include <stdio.h>
 #include <string.h>
 

diff --git a/optimize.c b/optimize.c
index d44e041d2cb770a33716917c2c6847c269ed8c36..f8ed03a495f9b60ad42fa3f38ae53658f026f2a7 100644 (file)
--- a/optimize.c
+++ b/optimize.c
@@ -22,16 +22,13 @@
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/optimize.c,v 1.71 2001-11-12 22:04:23 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/optimize.c,v 1.69.2.1 2002-03-24 23:25:38 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <sys/types.h>
-#include <sys/time.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <memory.h>
@@ -120,6 +117,9 @@ static void opt_peep(struct block *);
 static void opt_stmt(struct stmt *, int[], int);
 static void deadstmt(struct stmt *, struct stmt *[]);
 static void opt_deadstores(struct block *);
+static void opt_blk(struct block *, int);
+static int use_conflict(struct block *, struct block *);
+static void opt_j(struct edge *);
 static struct block *fold_edge(struct block *, struct edge *);
 static inline int eq_blk(struct block *, struct block *);
 static int slength(struct slist *);
@@ -820,16 +820,6 @@ opt_peep(b)
                done = 0;
                opt_not(b);
        }
-       /*
-        * jset #0        ->   never
-        * jset #ffffffff ->   always
-        */
-       if (b->s.code == (BPF_JMP|BPF_K|BPF_JSET)) {
-               if (b->s.k == 0)
-                       JT(b) = JF(b);
-               if (b->s.k == 0xffffffff)
-                       JF(b) = JT(b);
-       }
        /*
         * If the accumulator is a known constant, we can compute the
         * comparison result.

diff --git a/savefile.c b/savefile.c
index 06d5a2a1cff46cf40746707d155ab3c8c053931e..4303fb60cb277b377f0ba57e0b5cec935efb5c7f 100644 (file)
--- a/savefile.c
+++ b/savefile.c
@@ -30,16 +30,13 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.55.2.1 2002-03-08 11:28:03 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.55.2.2 2002-03-24 23:25:38 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <sys/types.h>
-#include <sys/time.h>
-
 #include <errno.h>
 #include <memory.h>
 #include <stdio.h>