]> The Tcpdump Group git mirrors - libpcap/commitdiff
Move "union thdr" to pcap-int.h, as we use it in pcap-int.h.
authorGuy Harris <[email protected]>
Wed, 25 Mar 2009 15:48:57 +0000 (08:48 -0700)
committerGuy Harris <[email protected]>
Wed, 25 Mar 2009 15:48:57 +0000 (08:48 -0700)
pcap-int.h
pcap-linux.c

index d5d310b016834260bb079ab13640de6fb4daabb5..ab04d617797e03cf88c256e4d36117a98b87e674 100644 (file)
@@ -109,6 +109,14 @@ struct pcap_sf {
        u_char *base;
 };
 
+#ifdef linux
+union thdr {
+       struct tpacket_hdr      *h1;
+       struct tpacket2_hdr     *h2;
+       void                    *raw;
+};
+#endif
+
 /*
  * Used when doing a live capture.
  */
index f35d459656154955376270826d7f8aa58cdf05b9..b9809b0b8e165bd5774fbbf2deaa8585c2a52171 100644 (file)
@@ -245,12 +245,6 @@ static int pcap_setfilter_linux(pcap_t *, struct bpf_program *);
 static int pcap_setdirection_linux(pcap_t *, pcap_direction_t);
 static void pcap_cleanup_linux(pcap_t *);
 
-union thdr {
-       struct tpacket_hdr      *h1;
-       struct tpacket2_hdr     *h2;
-       void                    *raw;
-};
-
 #ifdef HAVE_PACKET_RING
 #define RING_GET_FRAME(h) (((union thdr **)h->buffer)[h->offset])