Module Name: src
Committed By: christos
Date: Tue Dec 31 17:08:14 UTC 2013
Modified Files:
src/external/bsd/libpcap/include: config.h
Log Message:
resolve conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libpcap/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libpcap/include/config.h
diff -u src/external/bsd/libpcap/include/config.h:1.4 src/external/bsd/libpcap/include/config.h:1.5
--- src/external/bsd/libpcap/include/config.h:1.4 Sat Apr 6 13:29:53 2013
+++ src/external/bsd/libpcap/include/config.h Tue Dec 31 12:08:14 2013
@@ -59,6 +59,15 @@
/* if libnl exists and is version 2.x */
/* #undef HAVE_LIBNL_2_x */
+/* if libnl exists and is version 3.x */
+/* #undef HAVE_LIBNL_3_x */
+
+/* libnl has NLE_FAILURE */
+/* #undef HAVE_LIBNL_NLE */
+
+/* libnl has new-style socket api */
+/* #undef HAVE_LIBNL_SOCKETS */
+
/* Define to 1 if you have the <limits.h> header file. */
#define HAVE_LIMITS_H 1
@@ -212,6 +221,9 @@
/* path for device for USB sniffing */
/* #undef LINUX_USB_MON_DEV */
+/* if we need a pcap_parse wrapper around yyparse */
+/* #undef NEED_YYPARSE_WRAPPER */
+
/* Define to 1 if netinet/ether.h declares `ether_hostton' */
/* #undef NETINET_ETHER_H_DECLARES_ETHER_HOSTTON */
@@ -251,6 +263,9 @@
/* 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 */
@@ -260,18 +275,23 @@
/* include ACN support */
/* #undef SITA */
+/* if struct sockaddr_hci has hci_channel member */
+/* #undef SOCKADDR_HCI_HAS_HCI_CHANNEL */
+
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* 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 */
@@ -281,6 +301,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 */
