Module Name: src
Committed By: martin
Date: Mon Feb 5 10:26:06 UTC 2018
Modified Files:
src/external/bsd/libarchive/dist/libarchive:
archive_openssl_evp_private.h
Log Message:
Try to fix the build: OpenSSL 1.0.2k already has the EVP inline functions.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/libarchive/dist/libarchive/archive_openssl_evp_private.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libarchive/dist/libarchive/archive_openssl_evp_private.h
diff -u src/external/bsd/libarchive/dist/libarchive/archive_openssl_evp_private.h:1.1.1.1 src/external/bsd/libarchive/dist/libarchive/archive_openssl_evp_private.h:1.2
--- src/external/bsd/libarchive/dist/libarchive/archive_openssl_evp_private.h:1.1.1.1 Thu Apr 20 12:55:35 2017
+++ src/external/bsd/libarchive/dist/libarchive/archive_openssl_evp_private.h Mon Feb 5 10:26:06 2018
@@ -28,7 +28,7 @@
#include <openssl/evp.h>
#include <openssl/opensslv.h>
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x100020bfL
#include <stdlib.h> /* malloc, free */
#include <string.h> /* memset */
static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
