From: Mark Andrews <marka@isc.org>
Date: Sun, 2 Dec 2012 22:09:19 +0000 (+1100)
Subject: treat clang 3.x and 4.x as independent release streams
X-Git-Tag: v9.10.0a1~680^2~1
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=c6f03e79030a4609b31388f9946a2bab7e59e7d7;p=thirdparty%2Fbind9.git

treat clang 3.x and 4.x as independent release streams
---

diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c
index c8f00adbcce..cc781993fbb 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