From c6f03e79030a4609b31388f9946a2bab7e59e7d7 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Mon, 3 Dec 2012 09:09:19 +1100 Subject: [PATCH] treat clang 3.x and 4.x as independent release streams --- lib/dns/tsig.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c index c8f00adbcc..cc781993fb 100644 --- a/lib/dns/tsig.c +++ b/lib/dns/tsig.c @@ -975,7 +975,9 @@ dns_tsig_sign(dns_message_t *msg) { goto cleanup_context; } #if defined(__clang__) && \ - ( __clang_major__ < 4 || (__clang_major__ == 4 && __clang_minor__ < 2)) + ( __clang_major__ < 3 || \ + (__clang_major__ == 3 && __clang_minor__ < 2) || \ + (__clang_major__ == 4 && __clang_minor__ < 2)) /* false positive: http://llvm.org/bugs/show_bug.cgi?id=14461 */ else memset(&querytsig, 0, sizeof(querytsig)); #endif @@ -1235,7 +1237,9 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg, return (ret); } #if defined(__clang__) && \ - ( __clang_major__ < 4 || (__clang_major__ == 4 && __clang_minor__ < 2)) + ( __clang_major__ < 3 || \ + (__clang_major__ == 3 && __clang_minor__ < 2) || \ + (__clang_major__ == 4 && __clang_minor__ < 2)) /* false positive: http://llvm.org/bugs/show_bug.cgi?id=14461 */ else memset(&querytsig, 0, sizeof(querytsig)); #endif