From: Brad King <brad.king@kitware.com>
Date: Wed, 21 Oct 2015 15:53:50 +0000 (-0400)
Subject: Guard inclusion of bcrypt.h with HAVE_BCRYPT_H
X-Git-Tag: v3.1.900a~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a81ffc0723ecfb8699280fcd01e2380e46029f94;p=thirdparty%2Flibarchive.git

Guard inclusion of bcrypt.h with HAVE_BCRYPT_H

We already use this guard everywhere except one inclusion.
---

diff --git a/libarchive/archive_hmac_private.h b/libarchive/archive_hmac_private.h
index 3e48bc3ac..6a8bbf294 100644
--- a/libarchive/archive_hmac_private.h
+++ b/libarchive/archive_hmac_private.h
@@ -35,7 +35,7 @@
 
 typedef	CCHmacContext archive_hmac_sha1_ctx;
 
-#elif defined(_WIN32) && !defined(__CYGWIN__)
+#elif defined(_WIN32) && !defined(__CYGWIN__) && defined(HAVE_BCRYPT_H)
 #include <bcrypt.h>
 
 typedef struct {