Commit 4f7068c1 authored by Ulf Möller's avatar Ulf Möller
Browse files

Fix some CygWin problems.

parent b144a5e9

crypto/asn1/a_time.c

+1 −3
Original line number Diff line number Diff line
@@ -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

crypto/asn1/a_utctm.c

+4 −3
Original line number Diff line number Diff line
@@ -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);

crypto/des/read_pwd.c

+1 −1
Original line number Diff line number Diff line
@@ -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