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

diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c
index c8f00adbcceae616a2b5a4126355717cf951c358..cc781993fbb481ba38d314930ce56fc543006e9e 100644 (file)
--- 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