openssl-engine-0.9.6 merge

1 files changed, 1 insertions, 3 deletions

diff --git a/src/lib/libcrypto/asn1/a_time.c b/src/lib/libcrypto/asn1/a_time.c
index b193f1c71f..8c0ddee4ac 100644
--- a/src/lib/libcrypto/asn1/a_time.c
+++ b/src/lib/libcrypto/asn1/a_time.c
@@ -113,11 +113,9 @@ 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)
+#if defined(THREADS) && !defined(WIN32) && !defined(__CYGWIN32__)
         struct tm data;
-#endif
 
-#if defined(THREADS) && !defined(WIN32)
         gmtime_r(&t,&data);
         ts=&data; /* should return &data, but doesn't on some systems, so we don't even look at the return value */
 #else