summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2009-04-28 13:00:50 +0000
committerRichard Levitte <levitte@openssl.org>2009-04-28 13:00:50 +0000
commit2c8275409eb4f26debe3ade5f137a989e73f9faf (patch)
tree3540468e8099ae6e5a1cc1ea17a041321ad22fd2 /crypto
parent892582b541fdd2daae88a17c1c885ea8f2597138 (diff)
Update from HEAD.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/bio/bss_dgram.c10
1 files changed, 6 insertions, 4 deletions
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