Commit 14097b6a authored by Richard Levitte's avatar Richard Levitte
Browse files

Code health: Stop using timeb.h / ftime() (VMS only) 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2775)
parent e627a13c

crypto/bio/bss_dgram.c

+1 −9
Original line number Diff line number Diff line
@@ -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

ssl/d1_lib.c

+1 −8
Original line number Diff line number Diff line
@@ -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