diff options
author | Richard Levitte <levitte@openssl.org> | 2002-01-26 04:18:50 +0300 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2002-01-26 04:18:50 +0300 |
commit | 41aad62a78dd53d09bff96caff39334df05fdf70 (patch) | |
tree | 278bcd24ed1385beb3a9996ac566cf79c632a623 /crypto/asn1/a_time.c | |
parent | 3964db29c4eb9a7002ddb0ec308b701c336fc66b (diff) |
Merge in the latest changes from the 0.9.6-stable branch.
Diffstat (limited to 'crypto/asn1/a_time.c')
-rw-r--r-- | crypto/asn1/a_time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c index 8c0ddee4ac..17475e0f49 100644 --- a/crypto/asn1/a_time.c +++ b/crypto/asn1/a_time.c @@ -113,7 +113,7 @@ ASN1_TIME *d2i_ASN1_TIME(ASN1_TIME **a, unsigned char **pp, long length) ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s, time_t t) { struct tm *ts; -#if defined(THREADS) && !defined(WIN32) && !defined(__CYGWIN32__) +#if defined(THREADS) && !defined(WIN32) && !defined(__CYGWIN32__) && !defined(_DARWIN) struct tm data; gmtime_r(&t,&data); |