diff options
author | Brad King <brad.king@kitware.com> | 2017-07-20 15:36:18 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2017-07-20 15:36:18 (GMT) |
commit | 6df1bda1c57193b289866389a994ea79a2f5e1d8 (patch) | |
tree | 7bf31a5dc1702e7a0faebe654da69f5c5eaeca90 /Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h | |
parent | b6674431af4790ba5deea9e5e6bd7b2620beb69e (diff) | |
parent | 11f3dcb04887fccf38a8eda19d498bf7a5060486 (diff) | |
download | CMake-6df1bda1c57193b289866389a994ea79a2f5e1d8.zip CMake-6df1bda1c57193b289866389a994ea79a2f5e1d8.tar.gz CMake-6df1bda1c57193b289866389a994ea79a2f5e1d8.tar.bz2 |
Merge branch 'upstream-LibArchive' into update-libarchive
* upstream-LibArchive:
LibArchive 2017-07-09 (98a69539)
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h')
-rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h b/Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h index 2deeb5f..59f95b8 100644 --- a/Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h +++ b/Utilities/cmlibarchive/libarchive/archive_openssl_hmac_private.h @@ -28,7 +28,7 @@ #include <openssl/hmac.h> #include <openssl/opensslv.h> -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) #include <stdlib.h> /* malloc, free */ #include <string.h> /* memset */ static inline HMAC_CTX *HMAC_CTX_new(void) |