Regenerate our lib/libpcap/config.h for libpcap 1.1.1.

1 files changed, 56 insertions, 26 deletions

diff --git a/lib/libpcap/config.h b/lib/libpcap/config.h
index f4dec9c..d3d4a9a 100644
--- a/lib/libpcap/config.h
+++ b/lib/libpcap/config.h
@@ -1,15 +1,8 @@
 /* $FreeBSD$ */
 /* This is an edited copy of the config.h generated by configure. */
 
-/* config.h.  Generated by configure.  */
+/* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
-/* Long story short: aclocal.m4 depends on autoconf 2.13
- * implementation details wrt "const"; newer versions
- * have different implementation details so for now we
- * put "const" here.  This may cause duplicate definitions
- * in config.h but that should be OK since they're the same.
- */
-/* #undef const */
 
 /* Enable optimizer debugging */
 /* #undef BDEBUG */
@@ -17,15 +10,15 @@
 /* define if you have a cloning BPF device */
 #define HAVE_CLONING_BPF 1
 
-/* define if you have dag_get_stream_erf_types() */
-/* #undef HAVE_DAG_GET_STREAM_ERF_TYPES */
-
 /* define if you have the DAG API */
 /* #undef HAVE_DAG_API */
 
 /* define if you have dag_get_erf_types() */
 /* #undef HAVE_DAG_GET_ERF_TYPES */
 
+/* define if you have dag_get_stream_erf_types() */
+/* #undef HAVE_DAG_GET_STREAM_ERF_TYPES */
+
 /* define if you have streams capable DAG API */
 /* #undef HAVE_DAG_STREAMS_API */
 
@@ -33,12 +26,12 @@
    don't. */
 #define HAVE_DECL_ETHER_HOSTTON 1
 
-/* if passive_req_t primitive exists */
-/* #undef HAVE_DLPI_PASSIVE */
-
 /* define if you have a /dev/dlpi */
 /* #undef HAVE_DEV_DLPI */
 
+/* if passive_req_t primitive exists */
+/* #undef HAVE_DLPI_PASSIVE */
+
 /* Define to 1 if you have the `ether_hostton' function. */
 #define HAVE_ETHER_HOSTTON 1
 
@@ -60,12 +53,18 @@
 /* if libdlpi exists */
 /* #undef HAVE_LIBDLPI */
 
+/* if libnl exists */
+/* #undef HAVE_LIBNL */
+
 /* Define to 1 if you have the <limits.h> header file. */
 #define HAVE_LIMITS_H 1
 
 /* if tp_vlan_tci exists */
 /* #undef HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI */
 
+/* Define to 1 if you have the <linux/usbdevice_fs.h> header file. */
+/* #undef HAVE_LINUX_USBDEVICE_FS_H */
+
 /* Define to 1 if you have the <linux/wireless.h> header file. */
 /* #undef HAVE_LINUX_WIRELESS_H */
 
@@ -85,27 +84,30 @@
 /* See Makefile */
 /* #undef HAVE_NET_PFVAR_H */
 
-/* if there's an os_proto.h */
+/* if there's an os_proto.h for this platform, to use additional prototypes */
 /* #undef HAVE_OS_PROTO_H */
 
 /* Define to 1 if you have the <paths.h> header file. */
 #define HAVE_PATHS_H 1
 
-/* define if you have a /proc/net/dev */
-/* #undef HAVE_PROC_NET_DEV */
+/* define if net/pfvar.h defines PF_NAT through PF_NORDR */
+#define HAVE_PF_NAT_THROUGH_PF_NORDR 1
 
 /* define if you have a Septel API */
 /* #undef HAVE_SEPTEL_API */
 
+/* define if you have Myricom SNF API */
+/* #undef HAVE_SNF_API */
+
 /* Define to 1 if you have the `snprintf' function. */
 #define HAVE_SNPRINTF 1
 
-/* if struct sockaddr has sa_len */
+/* if struct sockaddr has the sa_len member */
 #define HAVE_SOCKADDR_SA_LEN 1
 
 /* if struct sockaddr_storage exists */
 #define HAVE_SOCKADDR_STORAGE 1
- 
+
 /* define if socklen_t is defined */
 #define HAVE_SOCKLEN_T 1
 
@@ -130,9 +132,15 @@
 /* Define to 1 if you have the `strlcpy' function. */
 #define HAVE_STRLCPY 1
 
+/* Define to 1 if the system has the type `struct BPF_TIMEVAL'. */
+/* #undef HAVE_STRUCT_BPF_TIMEVAL */
+
 /* Define to 1 if the system has the type `struct ether_addr'. */
 /* #undef HAVE_STRUCT_ETHER_ADDR */
 
+/* Define to 1 if you have the <sys/bitypes.h> header file. */
+/* #undef HAVE_SYS_BITYPES_H */
+
 /* Define to 1 if you have the <sys/bufmod.h> header file. */
 /* #undef HAVE_SYS_BUFMOD_H */
 
@@ -157,6 +165,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
+/* if struct usbdevfs_ctrltransfer has bRequestType */
+/* #undef HAVE_USBDEVFS_CTRLTRANSFER_BREQUESTTYPE */
+
 /* define if version.h is generated in the build procedure */
 #define HAVE_VERSION_H 1
 
@@ -170,6 +181,7 @@
 #define HAVE___ATTRIBUTE__ 1
 
 /* IPv6 */
+/* See Makefile */
 /* #undef INET6 */
 
 /* if unaligned access fails */
@@ -208,6 +220,9 @@
 /* target host supports Bluetooth sniffing */
 /* #undef PCAP_SUPPORT_BT */
 
+/* target host supports CAN sniffing */
+/* #undef PCAP_SUPPORT_CAN */
+
 /* target host supports USB sniffing */
 /* #undef PCAP_SUPPORT_USB */
 
@@ -220,12 +235,12 @@
 /* Enable parser debugging */
 /* #undef YYDEBUG */
 
-/* needed on HP-UX */
-/* #undef _HPUX_SOURCE */
-
 /* Number of bits in a file offset, on hosts where this is settable. */
 /* #undef _FILE_OFFSET_BITS */
 
+/* needed on HP-UX */
+/* #undef _HPUX_SOURCE */
+
 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2).  */
 /* #undef _LARGEFILE_SOURCE */
 
@@ -235,20 +250,35 @@
 /* define on AIX to get certain functions */
 /* #undef _SUN */
 
+/* to handle Ultrix compilers that don't support const in prototypes */
+/* #undef const */
+
 /* Define as token for inline if inlining supported */
 #define inline inline
 
+/* Define to `short' if int16_t not defined. */
+/* #undef int16_t */
+
+/* Define to `int' if int32_t not defined. */
+/* #undef int32_t */
+
+/* Define to `long long' if int64_t not defined. */
+/* #undef int64_t */
+
+/* Define to `signed char' if int8_t not defined. */
+/* #undef int8_t */
+
 /* on sinix */
 /* #undef sinix */
 
-/* if we have u_int16_t */
+/* Define to `unsigned short' if u_int16_t not defined. */
 /* #undef u_int16_t */
 
-/* if we have u_int32_t */
+/* Define to `unsigned int' if u_int32_t not defined. */
 /* #undef u_int32_t */
 
-/* if we have u_int64_t */
+/* Define to `unsigned long long' if u_int64_t not defined. */
 /* #undef u_int64_t */
 
-/* if we have u_int8_t */
+/* Define to `unsigned char' if u_int8_t not defined. */
 /* #undef u_int8_t */