From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 20 Jul 2004 21:23:50 +0000 (+0000)
Subject: When faking gettimeofday with ftime, do it right.
X-Git-Tag: tor-0.0.8pre1~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06c11a61ce3eb3143d99c071d0e05b7fd1bdad45;p=thirdparty%2Ftor.git

When faking gettimeofday with ftime, do it right.


svn:r2068
---

diff --git a/src/common/util.c b/src/common/util.c
index d7f8e45cbe..21cb010b32 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -808,7 +808,10 @@ void tor_gettimeofday(struct timeval *timeval) {
     exit(1);
   }
 #elif defined(HAVE_FTIME)
-  ftime(timeval);
+  struct timeb tb;
+  ftime(&tb);
+  timeval->tv_sec = tb.time;
+  timeval->tv_usec = tb.millitm * 1000;
 #else
 #error "No way to get time."
 #endif
diff --git a/src/common/util.h b/src/common/util.h
index 51a5440051..0cc08e9a10 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -30,9 +30,10 @@
 #ifdef HAVE_FTIME
 #define USING_FAKE_TIMEVAL
 #include <sys/timeb.h>
-#define timeval timeb
-#define tv_sec time
-#define tv_usec millitm
+struct timeval {
+  time_t tv_sec;
+  unsigned int tv_usec;
+};
 #endif
 #endif