Module Name: src
Committed By: christos
Date: Wed Jan 17 06:10:28 UTC 2018
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSCore: mDNSEmbeddedAPI.h
src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c
mDNSUNP.h
src/external/apache2/mDNSResponder/dist/mDNSShared: dnssd_ipc.h
Log Message:
make lint compile again.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.h
cvs rdiff -u -r1.6 -r1.7 \
src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.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/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h
diff -u src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h:1.6 src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h:1.7
--- src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h:1.6 Sun Jan 14 15:04:55 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h Wed Jan 17 01:10:27 2018
@@ -2602,7 +2602,7 @@ extern mDNSu8 NumUnreachableDNSServers;
#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 @@ extern int MD5_Final(unsigned char *md,
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 @@ struct CompileTimeAssertionChecks_mDNS
#if APPLE_OSX_mDNSResponder
char sizecheck_ClientTunnel [(sizeof(ClientTunnel) <= 1256) ? 1 : -1];
#endif
+#endif
};
// Routine to initialize device-info TXT record contents
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.12 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.13
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.12 Sun Jan 14 15:04:56 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Wed Jan 17 01:10:27 2018
@@ -1455,7 +1455,7 @@ mDNSexport int mDNSPlatformMemCmp(const
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
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.h
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.h:1.1.1.3 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.h:1.2
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.h:1.1.1.3 Sun Jan 14 13:43:02 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.h Wed Jan 17 01:10:27 2018
@@ -101,7 +101,7 @@ struct ifi_info {
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
Index: src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h
diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h:1.6 src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h:1.7
--- src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h:1.6 Sun Jan 14 15:04:56 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h Wed Jan 17 01:10:28 2018
@@ -213,8 +213,10 @@ struct CompileTimeAssertionChecks_dnssd_
{
// 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
