diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-02-28 14:07:08 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-02-28 15:32:01 +0100 |
| commit | 14097b6a9263a40615a5c4cbf3fe808b1a14ffde (patch) | |
| tree | f16f7ad3ab0be036d54a229ed8ede352210d529a | |
| parent | e627a13cd58a54df830e0fc2853f3ea8862699f2 (diff) | |
| download | openssl-14097b6a9263a40615a5c4cbf3fe808b1a14ffde.tar.gz | |
Code health: Stop using timeb.h / ftime() (VMS only)
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2775)
| -rw-r--r-- | crypto/bio/bss_dgram.c | 10 | ||||
| -rw-r--r-- | ssl/d1_lib.c | 9 |
2 files changed, 2 insertions, 17 deletions
diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c index 0b1ab94b0d..b14d03666a 100644 --- a/crypto/bio/bss_dgram.c +++ b/crypto/bio/bss_dgram.c @@ -13,12 +13,9 @@ #include "bio_lcl.h" #ifndef OPENSSL_NO_DGRAM -# if !(defined(_WIN32) || defined(OPENSSL_SYS_VMS)) +# if !defined(_WIN32) # include <sys/time.h> # endif -# if defined(OPENSSL_SYS_VMS) -# include <sys/timeb.h> -# endif # ifndef OPENSSL_NO_SCTP # include <netinet/sctp.h> @@ -1939,11 +1936,6 @@ static void get_current_time(struct timeval *t) # endif 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); - t->tv_sec = (long)tb.time; - t->tv_usec = (long)tb.millitm * 1000; # else gettimeofday(t, NULL); # endif diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c index 213fad5a8d..eb6a0f8295 100644 --- a/ssl/d1_lib.c +++ b/ssl/d1_lib.c @@ -13,9 +13,7 @@ #include <openssl/rand.h> #include "ssl_locl.h" -#if defined(OPENSSL_SYS_VMS) -# include <sys/timeb.h> -#elif defined(OPENSSL_SYS_VXWORKS) +#if defined(OPENSSL_SYS_VXWORKS) # include <sys/times.h> #elif !defined(OPENSSL_SYS_WIN32) # include <sys/time.h> @@ -404,11 +402,6 @@ static void get_current_time(struct timeval *t) # endif 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); - t->tv_sec = (long)tb.time; - t->tv_usec = (long)tb.millitm * 1000; #else gettimeofday(t, NULL); #endif |