diff options
author | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
---|---|---|
committer | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
commit | 65145fa4c81da358fcbc3b650156dab705dfa34e (patch) | |
tree | 55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /lib/libpcap | |
parent | 60ff4eb0dff94a04d75d0d52a3957aaaf5f8c693 (diff) | |
parent | e6b664c390af88d4a87208bc042ce503da664c3b (diff) | |
download | FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.zip FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.tar.gz |
Merge sync of head
Diffstat (limited to 'lib/libpcap')
-rw-r--r-- | lib/libpcap/Makefile | 3 | ||||
-rw-r--r-- | lib/libpcap/config.h | 24 |
2 files changed, 22 insertions, 5 deletions
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile index 11d7f73..c36b3ef 100644 --- a/lib/libpcap/Makefile +++ b/lib/libpcap/Makefile @@ -40,6 +40,7 @@ MAN= pcap.3 \ pcap_findalldevs.3 \ pcap_freecode.3 \ pcap_get_selectable_fd.3 \ + pcap_get_tstamp_precision.3 \ pcap_geterr.3 \ pcap_inject.3 \ pcap_is_swapped.3 \ @@ -57,10 +58,12 @@ MAN= pcap.3 \ pcap_open_offline.3 \ pcap_set_buffer_size.3 \ pcap_set_datalink.3 \ + pcap_set_immediate_mode.3 \ pcap_set_promisc.3 \ pcap_set_rfmon.3 \ pcap_set_snaplen.3 \ pcap_set_timeout.3 \ + pcap_set_tstamp_precision.3 \ pcap_set_tstamp_type.3 \ pcap_setdirection.3 \ pcap_setfilter.3 \ diff --git a/lib/libpcap/config.h b/lib/libpcap/config.h index 60cb448..4033b27 100644 --- a/lib/libpcap/config.h +++ b/lib/libpcap/config.h @@ -227,13 +227,13 @@ /* #undef LINUX_USB_MON_DEV */ /* if we need a pcap_parse wrapper around yyparse */ -#define NEED_YYPARSE_WRAPPER +#define NEED_YYPARSE_WRAPPER 1 /* Define to 1 if netinet/ether.h declares `ether_hostton' */ /* #undef NETINET_ETHER_H_DECLARES_ETHER_HOSTTON */ /* Define to 1 if netinet/if_ether.h declares `ether_hostton' */ -#define NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON +#define NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON /**/ /* do not use protochain */ /* #undef NO_PROTOCHAIN */ @@ -250,6 +250,9 @@ /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "" +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + /* Define to the version of this package. */ #define PACKAGE_VERSION "" @@ -259,12 +262,18 @@ /* target host supports Bluetooth sniffing */ /* #undef PCAP_SUPPORT_BT */ +/* target host supports Bluetooth Monitor */ +/* #undef PCAP_SUPPORT_BT_MONITOR */ + /* target host supports CAN sniffing */ /* #undef PCAP_SUPPORT_CAN */ /* target host supports canusb */ /* #undef PCAP_SUPPORT_CANUSB */ +/* support D-Bus sniffing */ +/* #undef PCAP_SUPPORT_DBUS */ + /* target host supports netfilter sniffing */ /* #undef PCAP_SUPPORT_NETFILTER */ @@ -286,12 +295,14 @@ /* Enable parser debugging */ /* #undef YYDEBUG */ +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + /* 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 */ @@ -301,6 +312,9 @@ /* define on AIX to get certain functions */ /* #undef _SUN */ +/* define if your compiler allows __attribute__((format)) without a warning */ +#define __ATTRIBUTE___FORMAT_OK 1 + /* to handle Ultrix compilers that don't support const in prototypes */ /* #undef const */ |