diff options
| author | Ulf Möller <ulf@openssl.org> | 2000-09-09 04:45:18 +0000 |
|---|---|---|
| committer | Ulf Möller <ulf@openssl.org> | 2000-09-09 04:45:18 +0000 |
| commit | 4f7068c165b84f8f788a5fdbd2a1ef4253e44e9c (patch) | |
| tree | 66e9bb9e2ffb70460d5464e6e34734f1b226d401 /crypto | |
| parent | b144a5e907b5807248496ac6714a2c1a0b58e11c (diff) | |
| download | openssl-4f7068c165b84f8f788a5fdbd2a1ef4253e44e9c.zip openssl-4f7068c165b84f8f788a5fdbd2a1ef4253e44e9c.tar.gz openssl-4f7068c165b84f8f788a5fdbd2a1ef4253e44e9c.tar.bz2 | |
Fix some CygWin problems.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/asn1/a_time.c | 4 | ||||
| -rw-r--r-- | crypto/asn1/a_utctm.c | 7 | ||||
| -rw-r--r-- | 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 b193f1c..8c0ddee 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 b9b4d9a..d381c9e 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 789493f..9555abe 100644 --- a/crypto/des/read_pwd.c +++ b/crypto/des/read_pwd.c @@ -161,7 +161,7 @@ #include <sys/ioctl.h> #endif -#ifdef MSDOS +#if defined(MSDOS) && !defined(__CYGWIN32__) #include <conio.h> #define fgets(a,b,c) noecho_fgets(a,b,c) #endif |