Don't require IPv6 library support in order to support IPv6 addresses.

[tcpdump] / addrtoname.h

diff --git a/addrtoname.h b/addrtoname.h
index 03fb918733e8930c8813434e14851ba55e39a9a3..72e5ef19d54921ad5c9e9772b75853375270a3a0 100644 (file)
--- a/addrtoname.h
+++ b/addrtoname.h
@@ -19,6 +19,14 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+/*
+ * Definitions to let us compile most of the IPv6 code even on systems
+ * without IPv6 support.
+ */
+#ifndef INET6_ADDRSTRLEN
+#define INET6_ADDRSTRLEN       46
+#endif
+
 /* Name to address translation routines. */
 
 enum {
@@ -41,19 +49,13 @@ extern const char *dnaddr_string(netdissect_options *, u_short);
 extern const char *protoid_string(netdissect_options *, const u_char *);
 extern const char *ipxsap_string(netdissect_options *, u_short);
 extern const char *getname(netdissect_options *, const u_char *);
-#ifdef INET6
 extern const char *getname6(netdissect_options *, const u_char *);
-#endif
 extern const char *intoa(uint32_t);
 
 extern void init_addrtoname(netdissect_options *, uint32_t, uint32_t);
 extern struct hnamemem *newhnamemem(netdissect_options *);
-#ifdef INET6
 extern struct h6namemem *newh6namemem(netdissect_options *);
-#endif
 extern const char * ieee8021q_tci_string(const uint16_t);
 
 #define ipaddr_string(ndo, p) getname(ndo, (const u_char *)(p))
-#ifdef INET6
 #define ip6addr_string(ndo, p) getname6(ndo, (const u_char *)(p))
-#endif