From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 1 May 2013 17:37:57 +0000 (-0400)
Subject: Add regress_finalize to makefile.nmake
X-Git-Tag: release-2.1.3-alpha^0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85a40040d11d9f0cd5353b32a3675d01bbd7f188;p=libevent

Add regress_finalize to makefile.nmake
---

diff --git a/evutil_time.c b/evutil_time.c
index f677dafc..937e7e37 100644
--- a/evutil_time.c
+++ b/evutil_time.c
@@ -443,14 +443,14 @@ evutil_gettime_monotonic_(struct evutil_monotonic_timer *base,
 			 * accurate as we can; adjust_monotnonic_time() below
 			 * will keep it monotonic. */
 			counter_usec_elapsed = ticks_elapsed * 1000;
-			base->first_counter = counter.QuadPart - counter_usec_elapsed / base->usec_per_count;
+			base->first_counter = (ev_uint64_t) (counter.QuadPart - counter_usec_elapsed / base->usec_per_count);
 		}
-		tp->tv_sec = counter_usec_elapsed / 1000000;
+		tp->tv_sec = (time_t) (counter_usec_elapsed / 1000000);
 		tp->tv_usec = counter_usec_elapsed % 1000000;
 
 	} else {
 		/* We're just using GetTickCount(). */
-		tp->tv_sec = ticks / 1000;
+		tp->tv_sec = (time_t) (ticks / 1000);
 		tp->tv_usec = (ticks % 1000) * 1000;
 	}
 	adjust_monotonic_time(base, tp);
diff --git a/test/Makefile.nmake b/test/Makefile.nmake
index f4372b5c..19ea4e49 100644
--- a/test/Makefile.nmake
+++ b/test/Makefile.nmake
@@ -20,7 +20,7 @@ REGRESS_OBJS=regress.obj regress_buffer.obj regress_http.obj regress_dns.obj \
 	regress_et.obj regress_bufferevent.obj \
 	regress_listener.obj regress_util.obj tinytest.obj \
 	regress_main.obj regress_minheap.obj regress_iocp.obj \
-	regress_thread.obj $(SSL_OBJS)
+	regress_thread.obj regress_finalize.obj $(SSL_OBJS)
 
 OTHER_OBJS=test-init.obj test-eof.obj test-weof.obj test-time.obj \
 	bench.obj bench_cascade.obj bench_http.obj bench_httpclient.obj \