Commit 2c827540 authored by Richard Levitte's avatar Richard Levitte
Browse files

Update from HEAD.

parent 892582b5

crypto/bio/bss_dgram.c

+6 −4
Changes for crypto/bio/bss_dgram.c: 6 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -61,15 +61,12 @@ 


#include <stdio.h>

#include <errno.h>

#ifdef OPENSSL_SYS_VMS

#include <sys/time.h>

#endif

#define USE_SOCKETS

#include "cryptlib.h"



#include <openssl/bio.h>



#ifdef OPENSSL_SYS_WIN32

#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS)

#include <sys/timeb.h>

#endif
@@ -217,6 +214,11 @@ static int dgram_read(BIO *b, char *out, int outl) 
				_ftime(&tb);

				curtime.tv_sec = (long)tb.time;

				curtime.tv_usec = (long)tb.millitm * 1000;

#elif defined(OPENSSL_SYS_VMS)

				struct timeb tb;

				ftime(&tb);

				curtime.tv_sec = (long)tb.time;

				curtime.tv_usec = (long)tb.millitm * 1000;

#else

				gettimeofday(&curtime, NULL);

#endif