[src/trunk]: src/external/apache2/mDNSResponder/dist make lint compile again.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/61fd204e2765
branches:  trunk
changeset: 829110:61fd204e2765
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Jan 17 06:10:27 2018 +0000

description:
make lint compile again.

diffstat:

 external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h |  4 +++-
 external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c      |  2 +-
 external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.h        |  2 +-
 external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h     |  2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diffs (66 lines):

diff -r c196bdbdd827 -r 61fd204e2765 external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h
--- a/external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h    Wed Jan 17 04:31:59 2018 +0000
+++ b/external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h    Wed Jan 17 06:10:27 2018 +0000
@@ -2602,7 +2602,7 @@
 
 #if (defined(_MSC_VER))
     #define mDNSinline static __inline
-#elif ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 9)))
+#elif ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 9))) || defined(__lint__)
     #define mDNSinline static inline
 #endif
 
@@ -3562,6 +3562,7 @@
 
 struct CompileTimeAssertionChecks_mDNS
 {
+#ifndef __lint__
     // Check that the compiler generated our on-the-wire packet format structure definitions
     // properly packed, without adding padding bytes to align fields on 32-bit or 64-bit boundaries.
     char assert0[(sizeof(rdataSRV)         == 262                          ) ? 1 : -1];
@@ -3613,6 +3614,7 @@
 #if APPLE_OSX_mDNSResponder
     char sizecheck_ClientTunnel        [(sizeof(ClientTunnel)         <=  1256) ? 1 : -1];
 #endif
+#endif
 };
 
 // Routine to initialize device-info TXT record contents
diff -r c196bdbdd827 -r 61fd204e2765 external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
--- a/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Wed Jan 17 04:31:59 2018 +0000
+++ b/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Wed Jan 17 06:10:27 2018 +0000
@@ -1455,7 +1455,7 @@
 
 mDNSexport void mDNSPlatformQsort(void *base, int nel, int width, int (*compar)(const void *, const void *))
 {
-    return (qsort(base, nel, width, compar));
+    qsort(base, nel, width, compar);
 }
 
 // DNSSEC stub functions
diff -r c196bdbdd827 -r 61fd204e2765 external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.h
--- a/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.h   Wed Jan 17 04:31:59 2018 +0000
+++ b/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.h   Wed Jan 17 06:10:27 2018 +0000
@@ -101,7 +101,7 @@
 extern struct ifi_info  *get_ifi_info_linuxv6(int family, int doaliases);
 #endif
 
-#if defined(AF_INET6) && HAVE_IPV6
+#if defined(AF_INET6) && HAVE_IPV6 && !defined(INET6_ADDRSTRLEN)
 #define INET6_ADDRSTRLEN 46 /*Maximum length of IPv6 address */
 #endif
 
diff -r c196bdbdd827 -r 61fd204e2765 external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h
--- a/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h        Wed Jan 17 04:31:59 2018 +0000
+++ b/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h        Wed Jan 17 06:10:27 2018 +0000
@@ -213,8 +213,10 @@
 {
     // Check that the compiler generated our on-the-wire packet format structure definitions
     // properly packed, without adding padding bytes to align fields on 32-bit or 64-bit boundaries.
+#ifndef __lint__
     char assert0[(sizeof(client_context_t) ==  8) ? 1 : -1];
     char assert1[(sizeof(ipc_msg_hdr)      == 28) ? 1 : -1];
+#endif
 };
 
 #endif // DNSSD_IPC_H