Commit f469880c authored by Andy Polyakov's avatar Andy Polyakov
Browse files

d1_lib.c,bss_dgram.c: eliminate dependency on _ftime.

parent bbdfbacd

crypto/bio/bss_dgram.c

+9 −5
Original line number Diff line number Diff line
@@ -1895,11 +1895,15 @@ int BIO_dgram_non_fatal_error(int err) 


static void get_current_time(struct timeval *t)

	{

#ifdef OPENSSL_SYS_WIN32

	struct _timeb tb;

	_ftime(&tb);

	t->tv_sec = (long)tb.time;

	t->tv_usec = (long)tb.millitm * 1000;

#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WINCE)

	SYSTEMTIME st;

	union { unsigned __int64 ul; FILETIME ft; } now;



	GetSystemTime(&st);

	SystemTimeToFileTime(&st,&now.ft);

	now.ul -= 116444736000000000UI64;	/* re-bias to 1/1/1970 */

	t->tv_sec  = (long)(now.ul/10000000);

	t->tv_usec = ((int)(now.ul%10000000))/10;

#elif defined(OPENSSL_SYS_VMS)

	struct timeb tb;

	ftime(&tb);

ssl/d1_lib.c

+9 −5
Original line number Diff line number Diff line
@@ -452,11 +452,15 @@ int dtls1_handle_timeout(SSL *s) 


static void get_current_time(struct timeval *t)

{

#ifdef OPENSSL_SYS_WIN32

	struct _timeb tb;

	_ftime(&tb);

	t->tv_sec = (long)tb.time;

	t->tv_usec = (long)tb.millitm * 1000;

#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WINCE)

	SYSTEMTIME st;

	union { unsigned __int64 ul; FILETIME ft; } now;



	GetSystemTime(&st);

	SystemTimeToFileTime(&st,&now.ft);

	now.ul -= 116444736000000000UI64;	/* re-bias to 1/1/1970 */

	t->tv_sec  = (long)(now.ul/10000000);

	t->tv_usec = ((int)(now.ul%10000000))/10;

#elif defined(OPENSSL_SYS_VMS)

	struct timeb tb;

	ftime(&tb);