Remove pcap-missing.h.

Complete commit d5b1a16: pcap_list_datalinks() has been available since
libpcap 0.8.

diff --git a/CHANGES b/CHANGES
index c21104acc85e0ef8252bbcaa60cbf1d0facbcf6c..6173b3e8a8645b16c94b4bf810f6eb47928e355f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -64,6 +64,7 @@ DayOfTheWeek, Month DD, YYYY / The Tcpdump Group
       Disregard setlinebuf(3), always use setvbuf(3).
       Change Sun RPC code licence to BSD-3-Clause.
       Fix "ip broadcast" netmask byte order with the -f flag.
       Disregard setlinebuf(3), always use setvbuf(3).
       Change Sun RPC code licence to BSD-3-Clause.
       Fix "ip broadcast" netmask byte order with the -f flag.

+      Remove pcap-missing.h.

     Building and testing:
       Autoconf: Remove detection of early IPv6 stacks.
       Detect OS IPv6 support using AF_INET6 only.
     Building and testing:
       Autoconf: Remove detection of early IPv6 stacks.
       Detect OS IPv6 support using AF_INET6 only.

diff --git a/INSTALL.md b/INSTALL.md
index ecb4dde96d75db6b3effdbff5cbbe0d2813ddaa3..609c040b2a42e6e60d6874ed4d9675d5faa8eaf3 100644 (file)
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -141,7 +141,6 @@ nlpid.h             - OSI NLPID definitions
 ospf.h         - Open Shortest Path First definitions
 packetdat.awk  - TCP chunk summary awk script
 parsenfsfh.c   - Network File System file parser routines
 ospf.h         - Open Shortest Path First definitions
 packetdat.awk  - TCP chunk summary awk script
 parsenfsfh.c   - Network File System file parser routines

-pcap-missing.h - declarations of functions possibly missing from libpcap

 ppp.h          - Point to Point Protocol definitions
 print.c                - Top-level routines for protocol printing
 print-*.c      - The netdissect printers
 ppp.h          - Point to Point Protocol definitions
 print.c                - Top-level routines for protocol printing
 print-*.c      - The netdissect printers

diff --git a/Makefile.in b/Makefile.in
index 72f557e9947e1d1f7685eee2c9d9f5bc329621dc..1aba578ec789e6aea75d6531ecf7d31638dca7a0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -303,7 +303,6 @@ HDR = \
        openflow.h \
        ospf.h \
        oui.h \
        openflow.h \
        ospf.h \
        oui.h \

-       pcap-missing.h \

        ppp.h \
        print.h \
        rpc_auth.h \
        ppp.h \
        print.h \
        rpc_auth.h \

diff --git a/pcap-missing.h b/pcap-missing.h
deleted file mode 100644 (file)
index a86e0fb..0000000
--- a/pcap-missing.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 1988-2002
- *     The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#ifndef netdissect_pcap_missing_h
-#define netdissect_pcap_missing_h
-
-/*
- * Declarations of functions that might be missing from libpcap.
- */
-
-#ifndef HAVE_PCAP_LIST_DATALINKS
-extern int pcap_list_datalinks(pcap_t *, int **);
-#endif
-
-#endif /* netdissect_pcap_missing_h */

diff --git a/print.c b/print.c
index 1eb6793bf887c55e8a2f2196c410b46220fe10c8..f67597e3a51a3aaeeb1d1e4cd1f1c851ef7463eb 100644 (file)
--- a/print.c
+++ b/print.c
@@ -38,8 +38,6 @@
 #include "print.h"
 #include "netdissect-alloc.h"
 
 #include "print.h"
 #include "netdissect-alloc.h"
 

-#include "pcap-missing.h"
-

 struct printer {
        if_printer f;
        int type;
 struct printer {
        if_printer f;
        int type;

diff --git a/tcpdump.c b/tcpdump.c
index 96e8906b933a6cf00ec38fee3c5d69ee5c18525e..77fc084ea2d5379466eb21dc778873caf7fb3f46 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -141,7 +141,6 @@ The Regents of the University of California.  All rights reserved.\n";
 #include "netdissect.h"
 #include "interface.h"
 #include "addrtoname.h"
 #include "netdissect.h"
 #include "interface.h"
 #include "addrtoname.h"

-#include "pcap-missing.h"

 #include "ascii_strcasecmp.h"
 
 #include "print.h"
 #include "ascii_strcasecmp.h"
 
 #include "print.h"