projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
aab790a
)
Fix typo and stop WIN32 warnings.
author
Dr. Stephen Henson
<steve@openssl.org>
Tue, 14 Apr 2009 15:13:35 +0000
(15:13 +0000)
committer
Dr. Stephen Henson
<steve@openssl.org>
Tue, 14 Apr 2009 15:13:35 +0000
(15:13 +0000)
crypto/bio/bss_dgram.c
patch
|
blob
|
history
diff --git
a/crypto/bio/bss_dgram.c
b/crypto/bio/bss_dgram.c
index 2717d77956f8fe17c5fea5afbf005124f4f1944f..dde0abe05a9324b98e3e0427c64a10ae19ca0ad9 100644
(file)
--- a/
crypto/bio/bss_dgram.c
+++ b/
crypto/bio/bss_dgram.c
@@
-66,6
+66,10
@@
#include <openssl/bio.h>
#include <openssl/bio.h>
+#ifdef OPENSSL_SYS_WIN32
+#include <sys/timeb.h>
+#endif
+
#define IP_MTU 14 /* linux is lame */
#ifdef WATT32
#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)
{
{
if (data->hstimeout.tv_sec > 0 || data->hstimeout.tv_usec > 0)
{
+ struct timeval curtime;
#ifdef OPENSSL_SYS_WIN32
#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
#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
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
#else
gettimeofday(&(data->hstimeout), NULL);
#endif