aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Zitzmann <nickzman@gmail.com>2013-07-30 20:20:20 -0600
committerNick Zitzmann <nickzman@gmail.com>2013-07-30 20:20:20 -0600
commitc3e721054822b6f2d099abb186c91518bc29be2c (patch)
tree306e75ba5d8677ba27943dfc155183fe98daaed8 /src
parent9a5c2d83734ec671f7fb81788a916f9ffa6fb4b6 (diff)
md5 & metalink: use better build macros on Apple operating systems
Previously we used __MAC_10_X and __IPHONE_X to mark digest-generating code that was specific to OS X and iOS. Now we use __MAC_OS_X_VERSION_MAX_ALLOWED and __IPHONE_OS_VERSION_MAX_ALLOWED instead of those macros. Bug: http://sourceforge.net/p/curl/bugs/1255/ Reported by: Edward Rudd
Diffstat (limited to 'src')
-rw-r--r--src/tool_metalink.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/tool_metalink.c b/src/tool_metalink.c
index f9e9869b2..be5fc26c4 100644
--- a/src/tool_metalink.c
+++ b/src/tool_metalink.c
@@ -57,12 +57,15 @@
# ifdef HAVE_NSS_INITCONTEXT
static NSSInitContext *nss_context;
# endif
-#elif defined(__MAC_10_4) || defined(__IPHONE_5_0)
+#elif (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && \
+ (__MAC_OS_X_VERSION_MAX_ALLOWED >= 1040)) || \
+ (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && \
+ (__IPHONE_OS_VERSION_MAX_ALLOWED >= 20000))
/* For Apple operating systems: CommonCrypto has the functions we need.
The library's headers are even backward-compatible with OpenSSL's
headers as long as we define COMMON_DIGEST_FOR_OPENSSL first.
- These functions are available on Tiger and later, as well as iOS 5.0
+ These functions are available on Tiger and later, as well as iOS 2.0
and later. If you're building for an older cat, well, sorry. */
# define COMMON_DIGEST_FOR_OPENSSL
# include <CommonCrypto/CommonDigest.h>