From: Richard Levitte <levitte@openssl.org>
Date: Tue, 28 Apr 2009 13:00:50 +0000 (+0000)
Subject: Update from HEAD.
X-Git-Tag: OpenSSL_1_0_0-beta3~109
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2c8275409eb4f26debe3ade5f137a989e73f9faf;p=oweals%2Fopenssl.git

Update from HEAD.
---

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index e3967041b3..256868265c 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -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