Backout CHANGES update - wrong branch

[tcpdump] / acconfig.h

diff --git a/acconfig.h b/acconfig.h
index fbf95c8cc4d5da6b194a134a3ff723de23c95a56..f28d52c23043db46ca097847b92008d18b8c6932 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -20,7 +20,6 @@
 /* define if your struct __res_state has the nsort member */
 #undef HAVE_NEW_RES_STATE
 
 /* define if your struct __res_state has the nsort member */
 #undef HAVE_NEW_RES_STATE
 

-

 /*
  * define if struct ether_header.ether_dhost is a struct with ether_addr_octet
  */
 /*
  * define if struct ether_header.ether_dhost is a struct with ether_addr_octet
  */


@@ -65,6 +64,33 @@
 /* define if you have ether_ntohost() and it works */
 #undef USE_ETHER_NTOHOST
 
 /* define if you have ether_ntohost() and it works */
 #undef USE_ETHER_NTOHOST
 

+/* define if libpcap has pcap_version */
+#undef HAVE_PCAP_VERSION
+
+/* define if libpcap has pcap_debug */
+#undef HAVE_PCAP_DEBUG
+
+/* define if libpcap has yydebug */
+#undef HAVE_YYDEBUG
+
+/* define if libpcap has pcap_list_datalinks() */
+#undef HAVE_PCAP_LIST_DATALINKS
+
+/* define if libpcap has pcap_set_datalink() */
+#undef HAVE_PCAP_SET_DATALINK
+
+/* define if libpcap has pcap_datalink_name_to_val() */
+#undef HAVE_PCAP_DATALINK_NAME_TO_VAL
+
+/* define if libpcap has pcap_datalink_val_to_description() */
+#undef HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION
+
+/* define if libpcap has pcap_dump_ftell() */
+#undef HAVE_PCAP_DUMP_FTELL
+
+/* define if you have getrpcbynumber() */
+#undef HAVE_GETRPCBYNUMBER
+

 /* define if unaligned memory accesses fail */
 #undef LBL_ALIGN
 
 /* define if unaligned memory accesses fail */
 #undef LBL_ALIGN
 


@@ -80,13 +106,31 @@
 /* AIX hack. */
 #undef _SUN
 
 /* AIX hack. */
 #undef _SUN
 

-/* Workaround for missing sized types */
-/* XXX this should move to the more standard uint*_t */
-#undef int16_t
-#undef int32_t
-#undef u_int16_t
-#undef u_int32_t
-#undef u_int8_t
+/* Workaround for missing 64-bit formats */
+#undef PRId64
+#undef PRIo64
+#undef PRIx64
+#undef PRIu64

 
 /* Whether or not to include the possibly-buggy SMB printer */
 #undef TCPDUMP_DO_SMB
 
 /* Whether or not to include the possibly-buggy SMB printer */
 #undef TCPDUMP_DO_SMB

+
+/* 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
+
+/* Define if you have the dnet_htoa function.  */
+#undef HAVE_DNET_HTOA
+
+/* Define if you have a dnet_htoa declaration in <netdnet/dnetdb.h>.  */
+#undef HAVE_NETDNET_DNETDB_H_DNET_HTOA
+
+/* define if should drop privileges by default */
+#undef WITH_USER
+
+/* define if should chroot when dropping privileges */
+#undef WITH_CHROOT