diff options
author | Brad King <brad.king@kitware.com> | 2020-08-19 16:50:05 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2020-08-19 16:50:05 (GMT) |
commit | 7d0fa4a943f90567979b5d43c2249cc58ccca5d7 (patch) | |
tree | ad4d0e4827e65d0986220c03fe7a0197d430dd6e /Utilities/cmcurl/lib/md4.c | |
parent | c156948327abea7fc569fd94efa474d682a1211f (diff) | |
parent | 7ceb56989f8ab3a4e1b1f2c48c9a0f382b85ec04 (diff) | |
download | CMake-7d0fa4a943f90567979b5d43c2249cc58ccca5d7.zip CMake-7d0fa4a943f90567979b5d43c2249cc58ccca5d7.tar.gz CMake-7d0fa4a943f90567979b5d43c2249cc58ccca5d7.tar.bz2 |
Merge branch 'upstream-curl' into update-curl
* upstream-curl:
curl 2020-08-19 (9d954e49)
Diffstat (limited to 'Utilities/cmcurl/lib/md4.c')
-rw-r--r-- | Utilities/cmcurl/lib/md4.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Utilities/cmcurl/lib/md4.c b/Utilities/cmcurl/lib/md4.c index 0fab52d..67119cd 100644 --- a/Utilities/cmcurl/lib/md4.c +++ b/Utilities/cmcurl/lib/md4.c @@ -102,7 +102,9 @@ static void MD4_Final(unsigned char *result, MD4_CTX *ctx) #include <openssl/md4.h> #elif (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && \ - (__MAC_OS_X_VERSION_MAX_ALLOWED >= 1040)) || \ + (__MAC_OS_X_VERSION_MAX_ALLOWED >= 1040) && \ + defined(__MAC_OS_X_VERSION_MIN_ALLOWED) && \ + (__MAC_OS_X_VERSION_MIN_ALLOWED < 101500)) || \ (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && \ (__IPHONE_OS_VERSION_MAX_ALLOWED >= 20000)) |