From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 20 Nov 2008 05:41:10 +0000 (+0000)
Subject: Provide INET6_ADDRSTRLEN if it is missing
X-Git-Tag: NTP_4_2_5P145~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a676f1d36775c9fa942403f46de80b9fdadadab;p=thirdparty%2Fntp.git

Provide INET6_ADDRSTRLEN if it is missing

bk: 4924f876bqSZwa8fmnuWlbxqjgqZjw
---

diff --git a/ChangeLog b/ChangeLog
index 83bb47e6f..117d7468e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Provide INET6_ADDRSTRLEN if it is missing.
 * [Bug 1095] overflow in caljulian.c.
 (4.2.5p144) 2008/11/19 Released by Harlan Stenn <stenn@ntp.org>
 * Use int32, not int32_t.
diff --git a/include/ntp_rfc2553.h b/include/ntp_rfc2553.h
index da73362f9..8abdd4510 100644
--- a/include/ntp_rfc2553.h
+++ b/include/ntp_rfc2553.h
@@ -89,23 +89,27 @@
  */
 
 #ifndef AF_INET6
-#define AF_INET6	AF_MAX
-#define PF_INET6	AF_INET6
+# define AF_INET6	AF_MAX
+# define PF_INET6	AF_INET6
 #endif
 
 #if !defined(_SS_MAXSIZE) && !defined(_SS_ALIGNSIZE)
 
-#define	_SS_MAXSIZE	128
-#define	_SS_ALIGNSIZE	(sizeof(ntp_uint64_t))
-#ifdef HAVE_SA_LEN_IN_STRUCT_SOCKADDR
-#define	_SS_PAD1SIZE	(_SS_ALIGNSIZE - sizeof(u_char) - sizeof(ntp_u_int8_t))
-#define	_SS_PAD2SIZE	(_SS_MAXSIZE - sizeof(u_char) - sizeof(ntp_u_int8_t) - \
+# define	_SS_MAXSIZE	128
+# define	_SS_ALIGNSIZE	(sizeof(ntp_uint64_t))
+# ifdef HAVE_SA_LEN_IN_STRUCT_SOCKADDR
+#  define	_SS_PAD1SIZE	(_SS_ALIGNSIZE - sizeof(u_char) - sizeof(ntp_u_int8_t))
+#  define	_SS_PAD2SIZE	(_SS_MAXSIZE - sizeof(u_char) - sizeof(ntp_u_int8_t) - \
 				_SS_PAD1SIZE - _SS_ALIGNSIZE)
-#else
-#define	_SS_PAD1SIZE	(_SS_ALIGNSIZE - sizeof(short))
-#define	_SS_PAD2SIZE	(_SS_MAXSIZE - sizeof(short) - \
+# else
+#  define	_SS_PAD1SIZE	(_SS_ALIGNSIZE - sizeof(short))
+#  define	_SS_PAD2SIZE	(_SS_MAXSIZE - sizeof(short) - \
 				_SS_PAD1SIZE - _SS_ALIGNSIZE)
-#endif /* HAVE_SA_LEN_IN_STRUCT_SOCKADDR */
+# endif /* HAVE_SA_LEN_IN_STRUCT_SOCKADDR */
+#endif
+
+#ifndef INET6_ADDRSTRLEN
+# define	INET6_ADDRSTRLEN	46	/* max len of IPv6 addr in ascii */
 #endif
 
 /*