When faking gettimeofday with ftime, do it right.

svn:r2068

diff --git a/src/common/util.c b/src/common/util.c
index d7f8e45cbe8113edd915d8ddd1c875be1ccb95d4..21cb010b32466226e226458df301f6ecdf929af5 100644 (file)
--- 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 51a5440051569255610d13190018350f36b1faa0..0cc08e9a10513fb6dc5b1c49eb2e79cf6b273b56 100644 (file)
--- 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