From 4f7068c165b84f8f788a5fdbd2a1ef4253e44e9c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulf=20M=C3=B6ller?= Date: Sat, 9 Sep 2000 04:45:18 +0000 Subject: [PATCH] Fix some CygWin problems. --- crypto/asn1/a_time.c | 4 +--- crypto/asn1/a_utctm.c | 7 ++++--- crypto/des/read_pwd.c | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c index b193f1c71f..8c0ddee4ac 100644 --- a/crypto/asn1/a_time.c +++ b/crypto/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 diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c index b9b4d9a005..d381c9e0d1 100644 --- a/crypto/asn1/a_utctm.c +++ b/crypto/asn1/a_utctm.c @@ -193,7 +193,8 @@ ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s, time_t t) { char *p; struct tm *ts; -#if defined(THREADS) && !defined(WIN32) +#if defined(THREADS) && !defined(WIN32) && !defined(__CYGWIN32__) + struct tm data; #endif @@ -202,7 +203,7 @@ ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s, time_t t) if (s == NULL) return(NULL); -#if defined(THREADS) && !defined(WIN32) +#if defined(THREADS) && !defined(WIN32) && !defined(__CYGWIN32__) gmtime_r(&t,&data); /* should return &data, but doesn't on some systems, so we don't even look at the return value */ ts=&data; #else @@ -285,7 +286,7 @@ int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t) t -= offset*60; /* FIXME: may overflow in extreme cases */ -#if defined(THREADS) && !defined(WIN32) +#if defined(THREADS) && !defined(WIN32) && !defined(__CYGWIN32__) { struct tm data; gmtime_r(&t, &data); tm = &data; } #else tm = gmtime(&t); diff --git a/crypto/des/read_pwd.c b/crypto/des/read_pwd.c index 789493f0c9..9555abe3a5 100644 --- a/crypto/des/read_pwd.c +++ b/crypto/des/read_pwd.c @@ -161,7 +161,7 @@ #include #endif -#ifdef MSDOS +#if defined(MSDOS) && !defined(__CYGWIN32__) #include #define fgets(a,b,c) noecho_fgets(a,b,c) #endif -- 2.25.1