diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-04-14 15:13:35 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-04-14 15:13:35 +0000 |
| commit | 10acacb3bf9f11e21ac7305a01903593ca71536b (patch) | |
| tree | 7f9fa0abe690d1cec9936990bf3597420b7df9fd | |
| parent | aab790a6561edc8ab0f0b5bbc31801a4a83e8b59 (diff) | |
Fix typo and stop WIN32 warnings.
| -rw-r--r-- | crypto/bio/bss_dgram.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c index 2717d77956..dde0abe05a 100644 --- a/crypto/bio/bss_dgram.c +++ b/crypto/bio/bss_dgram.c @@ -66,6 +66,10 @@ #include <openssl/bio.h> +#ifdef OPENSSL_SYS_WIN32 +#include <sys/timeb.h> +#endif + #define IP_MTU 14 /* linux is lame */ #ifdef WATT32 @@ -204,11 +208,12 @@ static int dgram_read(BIO *b, char *out, int outl) { if (data->hstimeout.tv_sec > 0 || data->hstimeout.tv_usec > 0) { + struct timeval curtime; #ifdef OPENSSL_SYS_WIN32 - struct timeb tb; - ftime(&tb); - curtime.tv_sec = tb.time; - curtime.tv_usec = tb.millitm * 1000; + struct _timeb tb; + _ftime(&tb); + curtime.tv_sec = (long)tb.time; + curtime.tv_usec = (long)tb.millitm * 1000; #else gettimeofday(&curtime, NULL); #endif @@ -374,10 +379,10 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr) if (num > 0) { #ifdef OPENSSL_SYS_WIN32 - struct timeb tb; - ftime(&tb); - data->hstimeout.tv_sec = tb.time; - data->hstimeout.tv_usec = tb.millitm * 1000; + struct _timeb tb; + _ftime(&tb); + data->hstimeout.tv_sec = (long)tb.time; + data->hstimeout.tv_usec = (long)tb.millitm * 1000; #else gettimeofday(&(data->hstimeout), NULL); #endif |